Merge branch 'develop' of https://zhangguoping@gitlab.dituhui.com/bsh/project/pr…

…oject.git into develop

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

@@ -135,6 +135,6 @@ public class UserInfo {
     /**
     /**
      * 是否正常 0： 否 1：是  默认1
      * 是否正常 0： 否 1：是  默认1
      */
      */
-    private Integer status = 1;
+    private Integer status;
 
 
 }
 }

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

@@ -451,6 +451,7 @@ public class UserService {
         }
         }
         assembleUpdateUserInfo(userInfo, userEntity);
         assembleUpdateUserInfo(userInfo, userEntity);
         userEntity = userDao.save(userEntity);
         userEntity = userDao.save(userEntity);
+        userInfo.setCreatedBy(userEntity.getCreatedBy());
         savaUserRoleAndOrgInfo(userInfo);
         savaUserRoleAndOrgInfo(userInfo);
         userInfo = BeanUtil.copyProperties(userEntity, UserInfo.class);
         userInfo = BeanUtil.copyProperties(userEntity, UserInfo.class);
         userInfo.setPassword(null);
         userInfo.setPassword(null);
@@ -661,6 +662,18 @@ public class UserService {
         if (StringUtils.isNotBlank(formUserInfo.getRegion())) {
         if (StringUtils.isNotBlank(formUserInfo.getRegion())) {
             toUserEntity.setRegion(formUserInfo.getRegion());
             toUserEntity.setRegion(formUserInfo.getRegion());
         }
         }
+        if (ObjectUtil.isNotNull(formUserInfo.getStatus())) {
+            toUserEntity.setStatus(formUserInfo.getStatus());
+        }
+        if (ObjectUtil.isNotNull(formUserInfo.getSource())) {
+            toUserEntity.setSource(formUserInfo.getSource());
+        }
+        if (StringUtils.isNotBlank(formUserInfo.getNotes())) {
+            toUserEntity.setNotes(formUserInfo.getNotes());
+        }
+        if (StringUtils.isNotBlank(formUserInfo.getEngineerCode())) {
+            toUserEntity.setEngineerCode(formUserInfo.getEngineerCode());
+        }
         toUserEntity.setSex(formUserInfo.getSex());
         toUserEntity.setSex(formUserInfo.getSex());
     }
     }