Merge branch 'developer' into 'master'

Developer

See merge request !14

gic-cloud-data-hook/src/main/java/com/gic/cloud/data/hook/web/FlatQueryController.java

@@ -32,6 +32,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -41,6 +42,12 @@ import java.util.List;
 @Controller
 public class FlatQueryController {
 
+	/** 脱敏字段 */
+	public static final List<String> FILTERS_PHONE_ONLY = Arrays.asList("mobile", "phone", "enterprise_name", "phone_number", "receive_phone_number", "use_phone_number", "mbr_phone");
+
+	/** 脱敏字段 */
+	public static final List<String> FILTERS_PHONE_AND_CARD = Arrays.asList("card_num", "mobile", "phone", "enterprise_name", "phone_number", "receive_phone_number","receive_card_num","use_phone_number", "use_card_num", "mbr_card_no");
+
 	/** 自助查询结果与字段过滤服务 */
 	@SuppressWarnings("SpringJavaInjectionPointsAutowiringInspection")
 	@Autowired
@@ -207,12 +214,18 @@ public class FlatQueryController {
 		Integer dataPermission = this.enterpriseService.getEnterpriseSettingByEnterpriseId(SessionContextUtils.getLoginUserEnterpriseId()).getDataPermission();
 		if(dataPermission != null){
 			for(FlatQueryCondition condition : queryConditions){
-				if("phone_number".equals(condition.getFieldName())){
+				if(dataPermission == 1){
+					if(FILTERS_PHONE_ONLY.contains(condition.getFieldName())){
 						condition.setEnableEncrypt(true);
+					}else {
+						condition.setEnableEncrypt(false);
+					}
 				}
 				if(dataPermission == 2){
-					if("card_num".equals(condition.getFieldName())){
+					if(FILTERS_PHONE_AND_CARD.contains(condition.getFieldName())){
 						condition.setEnableEncrypt(true);
+					} else {
+						condition.setEnableEncrypt(false);
 					}
 				}
 			}