添加申请页面抓取

base-manager/src/main/java/com/mortals/xhx/base/system/user/service/impl/UserServiceImpl.java

@@ -298,8 +298,8 @@ public class UserServiceImpl extends AbstractCRUDServiceImpl<UserDao, UserEntity
     public void updateUserList(List<UserPdu> list) {
         //更新本地用户信息，并且更新用户站点树
         for (UserPdu user : list) {
-            int count = this.count(new UserQuery().loginName(user.getLoginName()),null);
-            if (count==0) {
+            UserEntity tempUser = this.selectOne(new UserQuery().loginName(user.getLoginName()));
+            if (ObjectUtils.isEmpty(tempUser)) {
                 //新增
                 UserEntity entity = new UserEntity();
                 entity.initAttrValue();
@@ -311,7 +311,8 @@ public class UserServiceImpl extends AbstractCRUDServiceImpl<UserDao, UserEntity
             } else {
                 //更新
                 UserEntity userEntity = new UserEntity();
-                BeanUtils.copyProperties(user, userEntity, new String[]{"loginPwd", "userType", "status", "lastLoginTime", "lastLoginAddress"});
+                BeanUtils.copyProperties(user, userEntity, new String[]{"loginPwd","loginName", "userType", "status", "lastLoginTime", "lastLoginAddress"});
+                userEntity.setId(tempUser.getId());
                 this.updateWidthDao(userEntity);
                 Context context = new Context();
                 context.setUser(userEntity);