修复Bug

CODE/smart-community/property-api/src/main/java/com/community/huiju/model/User.java

@@ -90,23 +90,4 @@ public class User implements Serializable {
      */
     private LocalDateTime updateDate;
 
-    /**
-     * 角色名称
-     */
-    private String RoleName;
-
-    /**
-     * 创建人名称
-     */
-    private String CreateNmae;
-
-    /**
-     * 修改人名称
-     */
-    private String UpdateNmae;
-
-    /**
-     * 角色ID
-     */
-    private String RoleId;
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/UserServiceImpl.java

@@ -185,15 +185,15 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         IPage<User> pageInfo = userMapper.userList(page,loginName,userName,communityId);
         List<User> userList = pageInfo.getRecords();
         for (User user:userList){
-            //查询当前所有角色
-            user.setRoleName(selectRole(user.getId()));
-            // 创建人
-            String createNmae=userMapper.selectByIdUserName(user.getCreateUser());
-            // 修改人
-            String updateNmae=userMapper.selectByIdUserName(user.getUpdateUser());
-
-            user.setCreateNmae(createNmae);
-            user.setUpdateNmae(updateNmae);
+//            //查询当前所有角色
+//            user.setRoleName(selectRole(user.getId()));
+//            // 创建人
+//            String createNmae=userMapper.selectByIdUserName(user.getCreateUser());
+//            // 修改人
+//            String updateNmae=userMapper.selectByIdUserName(user.getUpdateUser());
+//
+//            user.setCreateNmae(createNmae);
+//            user.setUpdateNmae(updateNmae);
         }
 
         Map<String, Object> map = Maps.newHashMap();
@@ -284,7 +284,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         List<String> list=new ArrayList<String>();
         List<User> userList=userMapper.selectUser(ID);
         for (User user:userList){
-            list.add(user.getRoleId());
+            // list.add(user.getRoleId());
         }
         HashMap map= new HashMap<>();
         map.put("userList",userList);
@@ -319,7 +319,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         List<User> toUser= userMapper.selectRole(id);
         List<String> list=new ArrayList<String>();
         for (User user:toUser){
-            list.add(user.getRoleName());
+            // list.add(user.getRoleName());
         }
         String result = "";
         if (list != null && list.size() > 0) {

CODE/smart-community/property-api/src/main/java/com/community/huiju/vo/UserVO.java

@@ -19,4 +19,24 @@ public class UserVO extends User {
     /** 小区名称 **/
     private String communityName;
 
+    /**
+     * 角色名称
+     */
+    private String roleName;
+
+    /**
+     * 创建人名称
+     */
+    private String createNmae;
+
+    /**
+     * 修改人名称
+     */
+    private String updateNmae;
+
+    /**
+     * 角色ID
+     */
+    private String roleId;
+
 }