fix：添加返回字段

project-interface/src/main/java/com/dituhui/pea/pojo/UserInfoSearch.java

@@ -122,4 +122,9 @@ public class UserInfoSearch extends PageRequest implements Serializable {
      */
     private String notes;
 
+    /**
+     * 是否正常 0： 否 1：是  默认1
+     */
+    private Integer status = 1;
+
 }

project-user/src/main/java/com/dituhui/pea/user/service/UserService.java

@@ -702,7 +702,7 @@ public class UserService {
         entityManager.clear();
         PageResult<UserInfoSearch> pageResult = new PageResult<>();
         String count = "select count(*) ";
-        String select = "SELECT su.*,sr.name roleName ";
+        String select = "SELECT su.*,sr.name roleName ,sr.id roleId ";
         String limit = " ORDER BY su.CREATED_TIME  DESC   limit " + (search.getPage() - 1) * search.getSize() + "," + search.getSize();
         StringBuffer querySql = new StringBuffer("from sys_user su left join sys_user_role sur on su.id =sur.user_id left JOIN sys_role sr on sr.id =sur.role_id left join sys_user_org suo on su.id=suo.user_id  where 1=1 ");
         if (StringUtils.isNotBlank(search.getRoleId())) {
@@ -754,10 +754,12 @@ public class UserService {
         search.setNickname(map.containsKey("nickname") && ObjectUtil.isNotEmpty(map.get("nickname")) ? map.get("nickname").toString() : null);
         search.setBan(map.containsKey("ban") && ObjectUtil.isNotEmpty(map.get("ban")) ? Integer.parseInt(map.get("ban").toString()) : null);
         search.setSource(map.containsKey("source") && ObjectUtil.isNotEmpty(map.get("source")) ? Integer.parseInt(map.get("source").toString()) : null);
+        search.setStatus(map.containsKey("status") && ObjectUtil.isNotEmpty(map.get("status")) ? Integer.parseInt(map.get("status").toString()) : null);
         search.setEmail(map.containsKey("email") && ObjectUtil.isNotEmpty(map.get("email")) ? map.get("email").toString() : null);
         search.setPhone(map.containsKey("phone") && ObjectUtil.isNotEmpty(map.get("phone")) ? map.get("phone").toString() : null);
         search.setEngineerCode(map.containsKey("engineer_code") && ObjectUtil.isNotEmpty(map.get("engineer_code")) ? map.get("engineer_code").toString() : null);
         search.setRoleName(map.containsKey("roleName") && ObjectUtil.isNotEmpty(map.get("roleName")) ? map.get("roleName").toString() : null);
+        search.setRoleId(map.containsKey("roleId") && ObjectUtil.isNotEmpty(map.get("roleId")) ? map.get("roleId").toString() : null);
         search.setBan(map.containsKey("ban") && ObjectUtil.isNotEmpty(map.get("ban")) ? Integer.parseInt(map.get("ban").toString()) : null);
         search.setCreatedBy(map.containsKey("CREATED_BY") && ObjectUtil.isNotEmpty(map.get("CREATED_BY")) ? map.get("CREATED_BY").toString() : null);
         search.setUpdatedBy(map.containsKey("UPDATED_BY") && ObjectUtil.isNotEmpty(map.get("UPDATED_BY")) ? map.get("UPDATED_BY").toString() : null);