灵山项目：修改查询网格员列传参方式，增加返回政治面貌属性

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/StaffsByOrgAndRolesFormDTO.java

@@ -27,11 +27,6 @@ public class StaffsByOrgAndRolesFormDTO {
      */
     private String mobile;
 
-    /**
-     * 工作人员角色 网格员：grid_member、网格长：grid_manager
-     */
-    private String roleType;
-
     /**
      * 工作类型：专职：fulltime 兼职：parttime
      */

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/StaffsByOrgAndRoleRstDTO.java

@@ -67,5 +67,5 @@ public class StaffsByOrgAndRoleRstDTO {
      */
     private Integer mediator;
 
-
+    private String political;
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/UserServiceImpl.java

@@ -16,7 +16,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.List;
 
 @Service
@@ -54,15 +53,6 @@ public class UserServiceImpl implements UserService {
 
         // 先通过org库查询出工作人员的id列表
         List<String> staffIdsUnderAgency = govOrgService.listStaffIdsUnderAgency(orgIdPath, form.getOrgId());
-        //多处调用，判断是否传参
-        if (null == form.getRoleKeys() && form.getRoleKeys().size() == 0) {
-            //如果roleKeys是空，则无传参，判断roleType，如果不为空，添加查询参数
-            if (StringUtils.isNotEmpty(form.getRoleType())) {
-                List<String> roleKeys = new ArrayList<>();
-                roleKeys.add(form.getRoleType());
-            }
-        }
-
         // 再通过这些id列表，去过滤角色，并且查出详细信息
         return epmetUserService.staffsInRolesFromGivenStaffIds(staffIdsUnderAgency, form);
     }

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml

@@ -226,10 +226,11 @@
             cs.BIRTHDAY,
             cs.ADDRESS,
             cs.WORK_TYPE AS workType,
-            cs.HEAD_PHOTO AS headPhoto
+            cs.HEAD_PHOTO AS headPhoto,
             cs.ID_CARD AS idCard,
             cs.MEMBER,
-            cs.MEDIATOR
+            cs.MEDIATOR,
+            cs.POLITICAL
         FROM (
                 SELECT DISTINCT srr.STAFF_ID
                 FROM staff_role srr

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java

@@ -22,7 +22,6 @@ import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
-import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.RSASignature;
 import com.epmet.commons.tools.utils.Result;
@@ -58,12 +57,13 @@ import java.util.Map;
 @RestController
 @RequestMapping("customerstaff")
 public class CustomerStaffController {
+
     @Value("${epmet.login.privateKey}")
     private String privateKey;
+
     @Autowired
     private CustomerStaffService customerStaffService;
-    @Autowired
+
-    private LoginUserUtil loginUserUtil;
     @Autowired
     private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
 

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/CustomerStaffEntity.java

@@ -141,4 +141,18 @@ public class CustomerStaffEntity extends BaseEpmetEntity {
 	 * 出生日期
 	 */
 	private Date birthday;
+
+	/**
+	 * 是否两委委员  0 否  1 是
+	 */
+	private Integer member;
+	/**
+	 * 是否调解员 0 否  1 是
+	 */
+	private Integer mediator;
+
+	/**
+	 * 政治面貌
+	 */
+	private String political;
 }