Merge branch 'develop' of http://git.ycjcjy.com/fuxingfan/smartCommunity into develop

# Conflicts:
#	CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/UserController.java
#	CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/UserMapper.java
#	CODE/smart-community/property-api/src/main/java/com/community/huiju/service/IUserService.java
#	CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/UserServiceImpl.java
#	CODE/smart-community/property-api/src/main/resources/mapper/UserMapper.xml

CODE/smart-community/property-api/src/main/java/com/community/huiju/controller/UserController.java

@@ -37,7 +37,6 @@ public class UserController extends BaseController {
 	
 	@Autowired
 	private IUserService userService;
-
 	
 	@ApiOperation(value = "获取用户列表",nickname = "获取用户信息")
 	@ApiImplicitParams({
@@ -129,7 +128,7 @@ public class UserController extends BaseController {
 	@RequestMapping(value = "/user/upDate", method = RequestMethod.POST)
 	public ResponseBean upDate(@RequestBody String parameter,HttpSession session){
 		UserElement userElement = getUserElement(session);
-		ResponseBean  responseBean = userService.upDate(parameter,userElement.getId());
+		ResponseBean  responseBean = userService.upDate(parameter,userElement.getId(),userElement.getCommunityId());
 		return responseBean;
 	}
 
@@ -154,7 +153,7 @@ public class UserController extends BaseController {
 		ResponseBean  responseBean = userService.upDateStatus(parameter,userElement.getId());
 		return responseBean;
 	}
-	
+
 	@ApiOperation(value = "获取用户权限列表", notes = "获取用户权限列表")
 	@ApiImplicitParams({
 			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
@@ -167,4 +166,16 @@ public class UserController extends BaseController {
 		responseBean = userService.getPermission(userElement);
 		return responseBean;
 	}
+
+	@ApiOperation(value = "查看所有角色", notes = "查看所有角色")
+	@ApiImplicitParams({
+			@ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter" )
+	})
+	@RequestMapping(value = "/user/userRole", method = RequestMethod.POST)
+	public ResponseBean userRole(@RequestBody String parameter,HttpSession session){
+		UserElement userElement = getUserElement(session);
+		ResponseBean  responseBean = userService.allUserRole(parameter,userElement.getId(),userElement.getCommunityId());
+		return responseBean;
+	}
+
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/TpSysRoleMapper.java

@@ -3,6 +3,7 @@ package com.community.huiju.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.community.huiju.model.TpSysRole;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -25,4 +26,9 @@ public interface TpSysRoleMapper extends BaseMapper<TpSysRole> {
      */
     List<TpSysRole> selectByUserIdAndRoleId(Map<String, Object> map);
 
+    /**
+     * 得到所有角色
+     * @param communityId
+     */
+    List<TpSysRole> allUserRole(@Param("communityId") Integer communityId);
 }

CODE/smart-community/property-api/src/main/java/com/community/huiju/dao/UserMapper.java

@@ -7,6 +7,7 @@ import com.community.huiju.model.TaUser;
 import com.community.huiju.model.TpAnnouncement;
 import com.community.huiju.model.TpBuildingOwnerInfo;
 import com.community.huiju.model.User;
+import com.community.huiju.vo.UserVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -35,13 +36,14 @@ public interface UserMapper extends BaseMapper<User> {
      * @param id
      * @return
      */
-    List<User> selectUser(@Param("id") Integer id);
+    List<UserVO> selectUser(@Param("id") Integer id);
 
     /**
      * 查询当前多个角色
      * @param id
      * @return
      */
+
     List<User> selectRole(@Param("id") Integer id);
     
     /**
@@ -51,4 +53,5 @@ public interface UserMapper extends BaseMapper<User> {
      * @return
      */
 	List<Map<String, Object>> getPermission(@Param("userId") Integer userId,@Param("communityId") Integer communityId);
+
 }

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

@@ -24,6 +24,10 @@ public class TpSysRole implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    /**
+     * id
+     */
+    private Integer id;
     /**
      * 小区id
      */

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

@@ -60,7 +60,7 @@ public interface IUserService extends IService<User> {
      * @param id
      * @return
      */
-    ResponseBean upDate(String parameter, Integer id);
+    ResponseBean upDate(String parameter, Integer id,Integer communityId);
 
     /**
      * 查看成员详情
@@ -76,6 +76,7 @@ public interface IUserService extends IService<User> {
      * @return
      */
     ResponseBean upDateStatus(String parameter,Integer userID);
+
     
     /**
      * 获取当前用户的权限列表
@@ -83,4 +84,15 @@ public interface IUserService extends IService<User> {
      * @return
      */
 	ResponseBean getPermission(UserElement userElement);
+
+
+    /**
+     * 获取所有角色
+     * @param parameter
+     * @param id
+     * @param communityId
+     * @return
+     */
+    ResponseBean allUserRole(String parameter, Integer id, Integer communityId);
+
 }

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

@@ -23,6 +23,7 @@ import com.community.commom.utils.AccountValidatorUtil;
 import com.community.huiju.common.code.cache.AppkeyCache;
 import com.community.huiju.service.IUserService;
 import com.community.huiju.vo.UserVO;
+import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
 import com.google.common.collect.Maps;
 import org.apache.commons.lang.StringUtils;
@@ -184,20 +185,24 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
 
         IPage<User> pageInfo = userMapper.userList(page,loginName,userName,communityId);
         List<User> userList = pageInfo.getRecords();
+        List<UserVO> userVOList = Lists.newArrayList();
         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);
+            UserVO userVO = new UserVO();
+            BeanUtils.copyProperties(user, userVO);
+            //查询当前所有角色
+            userVO.setRoleName(selectRole(user.getId()));
+            // 创建人
+            String createNmae=userMapper.selectByIdUserName(user.getCreateUser());
+            // 修改人
+            String updateNmae=userMapper.selectByIdUserName(user.getUpdateUser());
+
+            userVO.setCreateNmae(createNmae);
+            userVO.setUpdateNmae(updateNmae);
+            userVOList.add(userVO);
         }
 
         Map<String, Object> map = Maps.newHashMap();
-        map.put("list", userList);
+        map.put("list", userVOList);
         map.put("total", pageInfo.getTotal());
         map.put("pageNum", pageInfo.getCurrent());
         map.put("pageSize", pageInfo.getSize());
@@ -212,6 +217,21 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         User user= new User();
 
         String loginName= object.getString("loginName");
+        if (!AccountValidatorUtil.isPhone(loginName)){
+            response.addError("请输入正确的手机号!");
+            return response;
+        }
+
+        QueryWrapper<User> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(User::getLoginName,loginName);
+        queryWrapper.lambda().eq(User::getCommunityId,communityId);
+        List<User> userLoginName= userMapper.selectList(queryWrapper);
+        for (User us:userLoginName) {
+            if (null != us.getLoginName()) {
+                response.addError("您输入的手机号已存在");
+                return response;
+            }
+        }
         String userName = object.getString("userName");
         JSONArray List = object.getJSONArray("menuArray");
         Integer[] roleIdArray = List.toArray(new Integer[]{});
@@ -223,12 +243,13 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         user.setStatus("1");;
         user.setCreateUser(userID);
         user.setCreateDate(LocalDateTime.now());
+        user.setCommunityId(communityId);
         userMapper.insert(user);
         //维护小区
-        TpUserCommunity tpUserCommunity= new TpUserCommunity();
-        tpUserCommunity.setCommunityId(communityId);
-        tpUserCommunity.setId(user.getId());
-        tpUserCommunityMapper.insert(tpUserCommunity);
+//        TpUserCommunity tpUserCommunity= new TpUserCommunity();
+//        tpUserCommunity.setCommunityId(communityId);
+//        tpUserCommunity.setTpUserId(user.getId());
+//        tpUserCommunityMapper.insert(tpUserCommunity);
         //会对应多个角色
         for (Integer roleID:roleIdArray  ){
             SysUserRole toSysUserRole= new SysUserRole();
@@ -241,12 +262,31 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
     }
 
     @Override
-    public ResponseBean upDate(String parameter, Integer userID) {
+    public ResponseBean upDate(String parameter, Integer userID,Integer communityId) {
         ResponseBean response = new ResponseBean<>();
         JSONObject object = JSONObject.parseObject(parameter);
         User user = new User();
 
         String loginName = object.getString("loginName");
+        if (!AccountValidatorUtil.isPhone(loginName)){
+            response.addError("请输入正确的手机号!");
+            return response;
+        }
+
+        QueryWrapper<User> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(User::getLoginName,loginName);
+        queryWrapper.lambda().eq(User::getCommunityId,communityId);
+        List<User> userLoginName= userMapper.selectList(queryWrapper);
+        for (User us:userLoginName) {
+            // 修改手机号码时排除自身
+            if (null != us.getLoginName()&&loginName.equals(us.getLoginName())){
+                break;
+            }
+            if (null != us.getLoginName()) {
+                response.addError("您输入的手机号已存在");
+                return response;
+            }
+        }
         Integer ID= object.getInteger("id");
         String userName = object.getString("userName");
         JSONArray List = object.getJSONArray("menuArray");
@@ -264,7 +304,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
 
         //会对应多个角色
         if (null!=List) {
-            sysUserRoleMapper.deleteById(ID);
+            QueryWrapper<SysUserRole> queryWrapperRole = new QueryWrapper<>();
+            queryWrapperRole.lambda().eq(SysUserRole::getUserId,ID);
+             sysUserRoleMapper.delete(queryWrapperRole);
             for (Integer roleID : roleIDArray) {
                 SysUserRole sysUserRole = new SysUserRole();
                 sysUserRole.setUserId(user.getId());
@@ -282,9 +324,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         JSONObject object= JSONObject.parseObject(parameter);
         Integer ID= object.getInteger("id");
         List<String> list=new ArrayList<String>();
-        List<User> userList=userMapper.selectUser(ID);
-        for (User user:userList){
-            // list.add(user.getRoleId());
+        List<UserVO> userList=userMapper.selectUser(ID);
+        for (UserVO userVO:userList){
+            list.add(userVO.getRoleId());
         }
         HashMap map= new HashMap<>();
         map.put("userList",userList);
@@ -313,6 +355,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         response.addSuccess("成功");
         return response;
     }
+
     
     /**
      * 获取当前用户的权限列表
@@ -329,15 +372,31 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         return responseBean;
     }
     
+
+
+    @Override
+    public ResponseBean allUserRole(String parameter, Integer id, Integer communityId) {
+        ResponseBean response = new ResponseBean<>();
+        List<TpSysRole> tpSysRole=tpSysRoleMapper.allUserRole(communityId);
+        response.addSuccess(tpSysRole);
+        return  response;
+    }
+
+
     //查询多个角色转换为字符串
     public String selectRole(Integer id) {
-        List<User> toUser= userMapper.selectRole(id);
+        List<UserVO> toUser= userMapper.selectRole(id);
+
         List<String> list=new ArrayList<String>();
-        for (User user:toUser){
-            // list.add(user.getRoleName());
-        }
+
+            for (UserVO userVo : toUser) {
+                if (userVo !=null &&userVo.getRoleName() != null && !userVo.getRoleName().equals("")) {
+                list.add(userVo.getRoleName());
+                }
+            }
+
         String result = "";
-        if (list != null && list.size() > 0) {
+        if ( null!=list && list.size() > 0) {
             for (String item : list) {
                 // 把列表中的每条数据用逗号分割开来，然后拼接成字符串
                 result += item + ",";

CODE/smart-community/property-api/src/main/resources/mapper/TpSysRoleMapper.xml

@@ -9,5 +9,12 @@
       on tsur.role_id = tsr.id
       WHERE tsur.user_id = #{userId}
     </select>
-
+    <select id="allUserRole" parameterType="int" resultType="com.community.huiju.model.TpSysRole">
+    SELECT
+    role_name,
+    id
+    FROM
+    tp_sys_role
+    WHERE community_id=#{communityId,jdbcType=INTEGER}
+    </select>
 </mapper>

CODE/smart-community/property-api/src/main/resources/mapper/UserMapper.xml

@@ -13,9 +13,9 @@
         SELECT
         sr.role_name,
         sr.description,
-        sr.create_user,
-        sr.create_date,
-        sr.update_date,
+        tu.create_user,
+        tu.create_date,
+        tu.update_date,
         sr.update_user,
         tu.user_name,
         tu.remark,
@@ -26,8 +26,6 @@
         tp_user tu
         LEFT JOIN tp_sys_user_role ON tu.id = tp_sys_user_role.user_id
         LEFT JOIN tp_sys_role sr ON tp_sys_user_role.role_id = sr.id
-        LEFT JOIN tp_user_community uc ON tu.id=uc.tp_user_id
-        group by tp_sys_user_role.user_id
         <where>
             <if test="loginName != null and loginName !=''" >
                 and tu.login_name = #{loginName,jdbcType=VARCHAR}
@@ -35,50 +33,52 @@
             <if test="userName != null and userName !=''" >
                 and tu.user_name like concat('%',#{userName,jdbcType=VARCHAR},'%')
             </if>
-            and  uc.community_id=#{communityId,jdbcType=INTEGER}
+            and  tu.community_id=#{communityId,jdbcType=INTEGER}
         </where>
+        GROUP BY tp_sys_user_role.user_id
     </select>
 
     <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.User" >
     update tp_user
-    <set >
-        <if test="userName != null" >
-            user_name = #{userName,jdbcType=VARCHAR},
-        </if>
-        <if test="loginName != null" >
-            login_name = #{loginName,jdbcType=VARCHAR},
-        </if>
-        <if test="loginPassword != null" >
-            login_password = #{loginPassword,jdbcType=VARCHAR},
-        </if>
-        <if test="email != null" >
-            email = #{email,jdbcType=VARCHAR},
-        </if>
-        <if test="headPortrait != null" >
-            head_portrait = #{headPortrait,jdbcType=VARCHAR},
-        </if>
-        <if test="remark != null" >
-            remark = #{remark,jdbcType=VARCHAR},
-        </if>
-        <if test="status != null" >
-            status = #{status,jdbcType=CHAR},
-        </if>
-        <if test="createUser != null" >
-            create_user = #{createUser,jdbcType=INTEGER},
-        </if>
-        <if test="createDate != null" >
-            create_date = #{createDate,jdbcType=TIMESTAMP},
-        </if>
-        <if test="updateUser != null" >
-            update_user = #{updateUser,jdbcType=INTEGER},
-        </if>
-        <if test="updateDate != null" >
-            update_date = #{updateDate,jdbcType=TIMESTAMP},
-        </if>
-    </set>
+        <set >
+            <if test="userName != null" >
+                user_name = #{userName,jdbcType=VARCHAR},
+            </if>
+            <if test="loginName != null" >
+                login_name = #{loginName,jdbcType=VARCHAR},
+            </if>
+            <if test="loginPassword != null" >
+                login_password = #{loginPassword,jdbcType=VARCHAR},
+            </if>
+            <if test="email != null" >
+                email = #{email,jdbcType=VARCHAR},
+            </if>
+            <if test="headPortrait != null" >
+                head_portrait = #{headPortrait,jdbcType=VARCHAR},
+            </if>
+            <if test="remark != null" >
+                remark = #{remark,jdbcType=VARCHAR},
+            </if>
+            <if test="status != null" >
+                status = #{status,jdbcType=CHAR},
+            </if>
+            <if test="createUser != null" >
+                create_user = #{createUser,jdbcType=INTEGER},
+            </if>
+            <if test="createDate != null" >
+                create_date = #{createDate,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateUser != null" >
+                update_user = #{updateUser,jdbcType=INTEGER},
+            </if>
+            <if test="updateDate != null" >
+                update_date = #{updateDate,jdbcType=TIMESTAMP},
+            </if>
+        </set>
+        where id = #{id,jdbcType=INTEGER}
     </update>
 
-    <select id="selectUser"  resultType="com.community.huiju.model.User" >
+    <select id="selectUser"  resultType="com.community.huiju.vo.UserVO" >
         SELECT
         sr.role_name,
         sr.description,
@@ -98,13 +98,9 @@
         LEFT JOIN tp_sys_role sr ON tp_sys_user_role.role_id = sr.id
         WHERE tu.id=#{id,jdbcType=INTEGER}
     </select>
-    <select id="selectRole"  resultType="com.community.huiju.model.User" parameterType="int">
+    <select id="selectRole"  resultType="com.community.huiju.vo.UserVO" parameterType="int">
         SELECT
-        sr.role_name,
-        tu.remark,
-        tu.login_name,
-        tu.id,
-        tp_sys_user_role.role_id
+        sr.role_name
         FROM
         tp_user tu
         LEFT JOIN tp_sys_user_role ON tu.id = tp_sys_user_role.user_id
@@ -123,5 +119,4 @@
             t.user_id = #{userId}
             AND t.community_id = #{communityId}
     </select>
-
 </mapper>

VUECODE/smart-property-manage/src/api/user.js

@@ -16,7 +16,7 @@ export function employeesList(data) {
 // 获取角色暂定写死
 export function userRoleById(data) {
   return request({
-    url: '/role/list',
+    url: '/user/userRole',
     method: 'post',
     data: {
       pageNum: data.pageNum,

VUECODE/smart-property-manage/src/router/index.js

@@ -213,6 +213,20 @@ export const constantRouterMap = [
         name: 'role-info',
         hidden: true,
         meta: { title: '查看角色', icon: 'table' }
+      },
+      {
+        path: '/account/user/addUser',
+        component: () => import('@/views/account/user/addUser'),
+        name: 'user-addUser',
+        hidden: true,
+        meta: { title: '添加成员', icon: 'table' }
+      },
+      {
+        path: '/account/user/editUser',
+        component: () => import('@/views/account/user/editUser'),
+        name: 'user-edit',
+        hidden: true,
+        meta: { title: '编辑成员', icon: 'table' }
       }
     ]
   },

VUECODE/smart-property-manage/src/store/modules/user.js

@@ -116,8 +116,7 @@ const user = {
     EmployeesList({ commit }, listQuery) {
       return new Promise((resolve, reject) => {
         employeesList(listQuery).then(response => {
-          const data = response.data
-          resolve(data)
+          resolve(response)
         }).catch(error => {
           reject(error)
         })

VUECODE/smart-property-manage/src/views/account/user/addUser.vue

@@ -60,7 +60,9 @@ export default {
         loginName: [
           { required: true, message: '请输入手机号', trigger: 'blur' }
         ],
-        
+        menuArray: [
+          { required: true, message: '请选择角色', trigger: 'blur' }
+        ],       
       }
     }
   },
@@ -90,6 +92,9 @@ export default {
               })
               loading.close()
               this.$router.push({ name: 'user-index' })
+            }else{
+              this.$message.error(res.message)
+               loading.close()
             }
           }).catch(() => {
             console.log('error AddUser')
@@ -117,7 +122,7 @@ export default {
     },
     getById(){
     this.$store.dispatch('UserRoleById', this.ruleForm).then((res) => {
-      this.menuData = res.data.list
+      this.menuData = res.data
       console.log(this.menuData)
     }).catch(() => {
       console.log('error UserRoleById')

VUECODE/smart-property-manage/src/views/account/user/editUser.vue

@@ -1,9 +1,10 @@
 <template>
   <div id="root">
     <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px" class="demo-ruleForm">
-      <el-form-item label="名称" prop="userName">
-        <el-input v-model="ruleForm.userName"/>
-      </el-form-item>
+       <el-form-item label="活动名称" prop="userName">
+          <el-input v-model="ruleForm.userName"/>
+       </el-form-item>
+    
      <el-form-item class="filter-item" label="手机号" prop="loginName" >
         <el-input v-model.trim="ruleForm.loginName" onkeyup="this.value=this.value.replace(/\D/g,'')" placeholder="手机号" />
       </el-form-item>
@@ -55,11 +56,15 @@ export default {
       },
       rules: {
         roleName: [
-          { required: true, message: '名称', trigger: 'blur' }
-        ],
+            { required: true, message: '请输入活动名称', trigger: 'blur' },
+            { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
+          ],
         loginName: [
           { required: true, message: '请输入手机号', trigger: 'blur' }
         ],
+        menuArray: [
+          { required: true, message: '请选择角色', trigger: 'blur' }
+        ],
         
       }
     }
@@ -82,16 +87,31 @@ export default {
         })
         if (valid) {
           console.log('this.roleName',this.roleName)
+          console.log('this.ruleForm.menuArray',this.ruleForm.menuArray)
+          // 各种校验
+          if(this.ruleForm.userName<=0){
+              this.$message.error('名称不能为空!')
+              loading.close()
+               return
+            }
+          if(this.ruleForm.menuArray[0]<0){
+              this.$message.error('请您选择角色!')
+              loading.close()
+               return
+            }
           this.$store.dispatch('UpDate', this.ruleForm).then((res) => {
             const resCode = res.code
             if (resCode === '0') {
               this.$message({
                 message: res.message,
                 type: 'success'
-              })
+              })           
               loading.close()
               this.$router.push({ name: 'user-index' })
-            }
+            }else {      
+           this.$message.error(res.message)
+           loading.close()
+        }
           }).catch(() => {
             console.log('error AddUser')
             loading.close()
@@ -118,22 +138,18 @@ export default {
     },
     getById(){
     this.$store.dispatch('UserRoleById', this.ruleForm).then((res) => {
-      this.menuData = res.data.list
-      console.log(this.menuData)
+      this.menuData = res.data
     }).catch(() => {
       console.log('error UserRoleById')
     })
 },
-  selectUser(id){
+    selectUser(id){
     this.ruleForm.id=id
-    this.$store.dispatch('SelectUser', this.ruleForm).then((res) => {
-      // this.ruleForm.loginName = res.data.loginName
-      // this.ruleForm=res.data[0]
-        // this.ruleForm.loginName.push(res.data[0])
+      this.$store.dispatch('SelectUser', this.ruleForm).then((res) => {
         this.ruleForm.loginName=res.data.userList[0].loginName
-         this.ruleForm.userName=res.data.userList[0].userName
-         this.ruleForm.remark=res.data.userList[0].remark
-         this.ruleForm.menuArray=res.data.roleList
+        this.ruleForm.userName=res.data.userList[0].userName
+        this.ruleForm.remark=res.data.userList[0].remark
+        this.ruleForm.menuArray=res.data.roleList
         console.log('res.data',res.data)
 
     }).catch(() => {

VUECODE/smart-property-manage/src/views/account/user/index.vue

@@ -19,7 +19,7 @@
     <el-table
       v-loading="listLoading"
       ref="multipleTable"
-      :data="listDate"
+      :data="listData"
       border
       tooltip-effect="dark"
       style="width: 100%; margin-top: 20px;"
@@ -69,7 +69,7 @@ export default {
         pageSize: 10
       },
       total: 0, // 数据总数
-      listDate: [],
+      listData: [],
       deleteIds: [], // 选择的id集合
       listLoading: true // 加载圈
     }
@@ -99,9 +99,11 @@ export default {
     dataQuery() { // 查询数据
       this.listLoading = true
       this.$store.dispatch('EmployeesList', this.listQuery).then((res) => {
-         this.listDate = res.item
-        this.list = res.item
-        this.total = res.total
+        const resData = res.data
+        this.listData = resData.list
+        this.listQuery.pageNum = resData.pageNum
+        this.listQuery.pageSize = resData.pageSize
+        this.total = resData.total
         this.listLoading = false
       }).catch(() => {
         this.listLoading = false
@@ -143,10 +145,17 @@ export default {
     },
     addUser(){
     this.$router.push({ name: 'user-addUser' })
-     this.listQuery.id=''
     },
     upDate(){
-      //  this.$router.push({ name: 'user-edit' })
+      const deleteIds = this.deleteIds
+      if (deleteIds.length > 1) {
+        this.$message.error('只能选择一行数据进行修改!')
+        return
+      }
+      if (deleteIds < 1) {
+        this.$message.error('请选择一行数据进行修改!')
+        return
+      }
        const ids = this.deleteIds[0]
           this.$router.push({ name: 'user-edit', params: { id: ids }})
     },