fix:添加用户字段

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

@@ -128,6 +128,11 @@ public class UserInfo {
     private String engineerCode;
     private String engineerCode;
 
 
     /**
     /**
+     * 备注
+     */
+    private String notes;
+
+    /**
      * 是否正常 0： 否 1：是  默认1
      * 是否正常 0： 否 1：是  默认1
      */
      */
     private Integer status = 1;
     private Integer status = 1;

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

@@ -65,7 +65,7 @@ public class UserInfoSearch extends PageRequest implements Serializable {
     /**
     /**
      * 最后登录时间
      * 最后登录时间
      */
      */
-    //private Date lastLoginTime;
+    private String lastLoginTime;
     /**
     /**
      * 用户自定义条件
      * 用户自定义条件
      */
      */
@@ -104,18 +104,22 @@ public class UserInfoSearch extends PageRequest implements Serializable {
     /**
     /**
      * 创建人
      * 创建人
      */
      */
-    //private String createdBy;
+    private String createdBy;
     /**
     /**
      * 创建时间
      * 创建时间
      */
      */
-    // private Date createdTime;
+    private String createdTime;
     /**
     /**
      * 更新人
      * 更新人
      */
      */
-    //private String updatedBy;
+    private String updatedBy;
     /**
     /**
      * 更新时间
      * 更新时间
      */
      */
-    // private Date updatedTime;
+    private String updatedTime;
+    /**
+     * 更新时间
+     */
+    private String notes;
 
 
 }
 }

project-user/src/main/java/com/dituhui/pea/user/entity/UserEntity.java

@@ -136,4 +136,10 @@ public class UserEntity implements Serializable {
      */
      */
     @Column(name = "engineer_code")
     @Column(name = "engineer_code")
     private String engineerCode;
     private String engineerCode;
+
+    /**
+     * 备注
+     */
+    @Column(name = "notes")
+    private String notes;
 }
 }

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

@@ -62,6 +62,8 @@ public class UserService {
      */
      */
     private static final int LIVE_TIME_MILLIS = 7200000;
     private static final int LIVE_TIME_MILLIS = 7200000;
     private static final Gson gson = new Gson();
     private static final Gson gson = new Gson();
+    private static final java.text.SimpleDateFormat formatter = new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+    ;
 
 
     @Autowired
     @Autowired
     UserDao userDao;
     UserDao userDao;
@@ -701,7 +703,7 @@ public class UserService {
             querySql.append("and su.source =" + search.getSource() + " ");
             querySql.append("and su.source =" + search.getSource() + " ");
         }
         }
         if (null != search.getOrgId()) {
         if (null != search.getOrgId()) {
-            querySql.append("and suo.org_id =" + search.getOrgId() + " ");
+            querySql.append("and suo.org_id ='" + search.getOrgId() + "'");
         }
         }
         if (null != search.getQueryString()) {
         if (null != search.getQueryString()) {
             querySql.append("and (su.engineer_code LIKE '%" + search.getQueryString() + "%' or su.nickname like '%" + search.getQueryString() + "%' or su.phone like '%" + search.getQueryString() + "%' or su.email  like '%" + search.getQueryString() + "%' )");
             querySql.append("and (su.engineer_code LIKE '%" + search.getQueryString() + "%' or su.nickname like '%" + search.getQueryString() + "%' or su.phone like '%" + search.getQueryString() + "%' or su.email  like '%" + search.getQueryString() + "%' )");
@@ -747,6 +749,13 @@ public class UserService {
         search.setPhone(map.containsKey("phone") && ObjectUtil.isNotEmpty(map.get("phone")) ? map.get("phone").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.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.setRoleName(map.containsKey("roleName") && ObjectUtil.isNotEmpty(map.get("roleName")) ? map.get("roleName").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);
+        search.setNotes(map.containsKey("notes") && ObjectUtil.isNotEmpty(map.get("notes")) ? map.get("notes").toString() : null);
+        search.setCreatedTime(map.containsKey("CREATED_TIME") && ObjectUtil.isNotEmpty(map.get("CREATED_TIME")) ? formatter.format(map.get("CREATED_TIME")) : null);
+        search.setUpdatedTime(map.containsKey("UPDATED_TIME") && ObjectUtil.isNotEmpty(map.get("UPDATED_TIME")) ? formatter.format(map.get("UPDATED_TIME")) : null);
+        search.setLastLoginTime(map.containsKey("LAST_LOGIN_TIME") && ObjectUtil.isNotEmpty(map.get("LAST_LOGIN_TIME")) ? formatter.format(map.get("LAST_LOGIN_TIME")) : null);
         return search;
         return search;
     }
     }