合并

CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/impl/ToSysRoleServiceImpl.java

@@ -169,6 +169,14 @@ public class ToSysRoleServiceImpl implements IToSysRoleService {
             return responseBean;
         }
 
+        // 根据角色名称查询
+        ToSysRole selectRole = toSysRoleMapper.selectByRoleName(roleName);
+        // 如果 selectRole 不等于null, 并且 toSysRole 的id 和 selectRole 的id 不相等
+        if (null != selectRole && toSysRole.getId().intValue() != selectRole.getId().intValue()) {
+            responseBean.addError("角色已存在!");
+            return responseBean;
+        }
+
         toSysRole.setRoleName(roleName);
         toSysRole.setDescription(description);
         toSysRole.setUpdateDate(new Date());
@@ -198,12 +206,12 @@ public class ToSysRoleServiceImpl implements IToSysRoleService {
             if (null == toSysRole) {
                 throw new WisdomException("删除失败, 角色编号 " + e + " 不存在!");
             }
-            toSysRole.setStatus("0");
-            toSysRole.setUpdateUser(userElement.getId());
-            toSysRole.setUpdateDate(new Date());
-            toSysRoleMapper.updateByPrimaryKeySelective(toSysRole);
+            // 删除这个角色
+            toSysRoleMapper.deleteByPrimaryKey(e);
+            // 删除角色和菜单关联关系
+            toSysRoleMenuMapper.deleteByRoleId(e);
         });
-        // 删除这个角色下关联关系
+        // 删除这个角色和用户关联关系
         toSysUserRoleMapper.deleteByRoleId(ids);
 
         responseBean.addSuccess("操作成功!");

CODE/smart-community/operate-api/src/main/resources/mapper/ToSysRoleMapper.xml

@@ -141,6 +141,7 @@
       <if test="roleName != null and roleName != ''">
         and role_name like concat('%',#{roleName,jdbcType=VARCHAR},'%')
       </if>
+      order by create_date DESC
     </where>
   </select>
 

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

@@ -83,7 +83,7 @@ public class RoleController extends BaseController {
 		return responseBean;
 	}
 	
-	@ApiOperation(value = "添加角色", notes = "添加角色")
+	@ApiOperation(value = "修改角色", notes = "修改角色")
 	@ApiImplicitParams({
 			@ApiImplicitParam(paramType = "path", dataTypeClass = Integer.class, name = "id", value = "角色id"),
 			@ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),

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

@@ -64,9 +64,12 @@ public class UserController extends BaseController {
 				jsonObject.getInteger("communityId"),
 				jsonObject.getString("code"));
 
-		UserVO userVO = (UserVO)responseBean.getData();
-		setUserElement(session,userVO);
-		userVO.setToken(session.getId());
+		// 为 0 表示成功
+		if ("0".equals(responseBean.getCode())) {
+			UserVO userVO = (UserVO)responseBean.getData();
+			setUserElement(session,userVO);
+			userVO.setToken(session.getId());
+		}
 
 		return responseBean;
 	}

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

@@ -8,8 +8,10 @@ import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
 import com.community.huiju.dao.RoleMapper;
 import com.community.huiju.dao.SysRoleMenuMapper;
+import com.community.huiju.dao.SysUserRoleMapper;
 import com.community.huiju.model.SysRole;
 import com.community.huiju.model.SysRoleMenu;
+import com.community.huiju.model.SysUserRole;
 import com.community.huiju.model.TpTransaction;
 import com.community.huiju.service.RoleServiceI;
 import com.google.common.collect.Maps;
@@ -35,6 +37,10 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, SysRole> implements
 	
 	@Autowired
 	private SysRoleMenuMapper sysRoleMenuMapper;
+
+	@Autowired
+	private SysUserRoleMapper sysUserRoleMapper;
+
 	/**
 	 * 获取角色列表
 	 *
@@ -76,8 +82,6 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, SysRole> implements
 		LocalDateTime dateTime = LocalDateTime.now();
 		sysRole.setCreateUser(userId);
 		sysRole.setCreateDate(dateTime);
-		sysRole.setUpdateUser(userId);
-		sysRole.setUpdateDate(dateTime);
 		//校验角色名不能相同
 		SysRole checkSysRole = roleMapper.selectByRoleName(sysRole.getRoleName());
 		if (null != checkSysRole){
@@ -103,6 +107,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, SysRole> implements
 	private int addSysRoleMenu(SysRole sysRole) {
 		List<SysRoleMenu> sysRoleMenuList = new ArrayList<SysRoleMenu>();
 		List<Integer> menuIdList = sysRole.getMenuArray();
+
 		menuIdList.stream().forEach(menuId -> {
 			SysRoleMenu sysRoleMenu = new SysRoleMenu();
 			sysRoleMenu.setCommunityId(sysRole.getCommunityId());
@@ -170,6 +175,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, SysRole> implements
 		queryWrapper.eq("role_id", sysRole.getId());
 		queryWrapper.eq("community_id", sysRole.getCommunityId());
 		sysRoleMenuMapper.delete(queryWrapper);
+
 		//重新添加
 		int count = addSysRoleMenu(sysRole);
 		if (count < 1){
@@ -203,7 +209,14 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, SysRole> implements
 			queryWrapper.eq("role_id", roleId);
 			queryWrapper.eq("community_id", userElement.getCommunityId());
 			sysRoleMenuMapper.delete(queryWrapper);
+
+			// 删除角色和用户关系
+			QueryWrapper<SysUserRole> deleteQueryWrapper = new QueryWrapper<>();
+			deleteQueryWrapper.eq("role_id", roleId);
+			deleteQueryWrapper.eq("community_id", userElement.getCommunityId());
+			sysUserRoleMapper.delete(deleteQueryWrapper);
 		});
+
 		responseBean.addSuccess(size);
 		return responseBean;
 	}

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

@@ -21,6 +21,7 @@ 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.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -75,6 +76,10 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
             responseBean.addError("当前手机号不存在, 请联系运营人员!");
             return responseBean;
         }
+        if ("0".equals(user.getStatus())) {
+            responseBean.addError("您的账号已停用!");
+            return responseBean;
+        }
 
         UserVO userVO = new UserVO();
         // 查询该用户的权限
@@ -120,9 +125,6 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         // 查询该用户的权限
         // 获取用户权限
         getUserRole(user,userVO);
-        
-        // 菜单权限
-        userVO.setPermissionList(getPermission(userElement));
 
         responseBean.addSuccess(userVO);
 
@@ -146,8 +148,17 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         Map<String, Object> map = Maps.newHashMap();
         map.put("userId", user.getId());
         List<TpSysRole> tpSysRoleList = tpSysRoleMapper.selectByUserIdAndRoleId(map);
+        if (CollectionUtils.isNotEmpty(tpSysRoleList)) {
+            userVO.setRoles(tpSysRoleList);
+            // 菜单权限
+            userVO.setPermissionList(getPermission(userVO.getId(), userVO.getCommunityId()));
+        } else {
+            TpSysRole tpSysRole = new TpSysRole();
+            tpSysRole.setRoleName("没有角色!");
+            userVO.setRoles(Arrays.asList(tpSysRole));
+            userVO.setPermissionList(Collections.EMPTY_LIST);
+        }
 
-        userVO.setRoles(tpSysRoleList);
     }
 
     /**
@@ -311,6 +322,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
                 SysUserRole sysUserRole = new SysUserRole();
                 sysUserRole.setUserId(user.getId());
                 sysUserRole.setRoleId(roleID);
+                sysUserRole.setCommunityId(communityId);
                 sysUserRoleMapper.insert(sysUserRole);
             }
         }
@@ -360,12 +372,13 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
     /**
      * 获取当前用户的权限列表
      *
-     * @param userElement
+     * @param userId
+     * @param communityId
      * @return
      */
-    public List<Map<String, Object>> getPermission(UserElement userElement) {
+    public List<Map<String, Object>> getPermission(Integer userId, Integer communityId) {
         List<Map<String,Object>> permissionList = new ArrayList<>();
-        permissionList = userMapper.getPermission(userElement.getId(),userElement.getCommunityId());
+        permissionList = userMapper.getPermission(userId,communityId);
         //构造id集合
         List<String> parentIdList = new ArrayList<>();
         permissionList.forEach(e -> {

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

@@ -127,8 +127,10 @@
 
     <select id="selectByPermissionList" resultType="java.util.Map">
         SELECT id,menu_name as menuName,menu_url as menuUrl,parent_id FROM tp_sys_menu WHERE id in
-        <foreach item="item" index="index" collection="array" open="(" separator="," close=")">
+        (
+        <foreach item="item" index="index" collection="array" separator=",">
         #{item}
         </foreach>
+        )
     </select>
 </mapper>

VUECODE/smart-operate-manage/src/permission.js

@@ -24,6 +24,15 @@ router.beforeEach((to, from, next) => {
               if (router.name === permission['menuUrl']) {
                 rounterMap.push(router)
               }
+              // 子节点匹配
+              router.children.forEach(children => {
+                if (children.name === permission['menuUrl']) {
+                  // 如果包含, 防止和上面重复添加, 不包含的时候添加一次
+                  if (!rounterMap.includes(router)) {
+                    rounterMap.push(router)
+                  }
+                }
+              })
             })
           })
 

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

@@ -1,10 +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-form-item label="姓名" prop="userName">
         <el-input v-model="ruleForm.userName"/>
       </el-form-item>
-     <el-form-item class="filter-item" label="手机号" prop="loginName" >
+      <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>
       <el-form-item label="角色" prop="menuArray">
@@ -37,7 +37,7 @@ export default {
       ruleForm: {
         id: '',
         userName: '',
-        loginName:'',
+        loginName: '',
         remark: '',
         roleName: '',
         createUser: '',
@@ -62,16 +62,15 @@ export default {
         ],
         menuArray: [
           { required: true, message: '请选择角色', trigger: 'blur' }
-        ],        
+        ]
       }
     }
   },
   mounted() {
-     this.getById()
+    this.getById()
   },
   methods: {
     submitForm(formName) {
-      
       // 获取选中的树形节点 key
       this.ruleForm.menuArray = this.$refs.tree.getCheckedKeys()
       this.$refs[formName].validate((valid) => {
@@ -82,16 +81,16 @@ export default {
           background: 'rgba(0, 0, 0, 0.7)'
         })
         if (valid) {
-          console.log('this.roleName',this.roleName)
+          console.log('this.roleName', this.roleName)
           this.$store.dispatch('AddUser', this.ruleForm).then((res) => {
-            if(this.ruleForm.menuArray.length<=0){
-               this.$message.error('请选择角色')
-               loading.close()
-               console.log('this.ruleForm.menuArray',this.ruleForm.menuArray)
-               return
+            if (this.ruleForm.menuArray.length <= 0) {
+              this.$message.error('请选择角色')
+              loading.close()
+              console.log('this.ruleForm.menuArray', this.ruleForm.menuArray)
+              return
             }
             const resCode = res.code
-            this.ruleForm.id=''
+            this.ruleForm.id = ''
             if (resCode === '0') {
               this.$message({
                 message: res.message,
@@ -99,7 +98,7 @@ export default {
               })
               loading.close()
               this.$router.push({ name: 'user-index' })
-            }else{
+            } else {
               this.$message.error(res.message)
             }
           }).catch(() => {
@@ -126,16 +125,16 @@ export default {
         console.log('error GetMenuList')
       })
     },
-    getById(){
-    this.$store.dispatch('UserRoleById', this.ruleForm).then((res) => {
-      this.menuData = res.data.list
-      console.log(this.menuData)
-    }).catch(() => {
-      console.log('error UserRoleById')
-    })
-}
-  }
+    getById() {
+      this.$store.dispatch('UserRoleById', this.ruleForm).then((res) => {
+        this.menuData = res.data.list
+        console.log(this.menuData)
+      }).catch(() => {
+        console.log('error UserRoleById')
+      })
+    }
   }
+}
 </script>
 
 <style scoped>

VUECODE/smart-operate-manage/src/views/account/user/edit.vue

@@ -1,7 +1,7 @@
 <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-form-item label="姓名" prop="userName">
         <el-input v-model="ruleForm.userName"/>
       </el-form-item>
       <el-form-item class="filter-item" label="手机号" prop="loginName" >
@@ -91,7 +91,7 @@ export default {
             }
           console.log('this.roleName',this.roleName)
           this.$store.dispatch('UpDate', this.ruleForm).then((res) => {
-            
+
             const resCode = res.code
             if (resCode === '0') {
               this.$message({

VUECODE/smart-property-manage/src/permission.js

@@ -24,6 +24,15 @@ router.beforeEach((to, from, next) => {
               if (router.name === permission['menuUrl']) {
                 rounterMap.push(router)
               }
+              // 子节点匹配
+              router.children.forEach(children => {
+                if (children.name === permission['menuUrl']) {
+                  // 如果不包含, 防止和上面重复添加
+                  if (!rounterMap.includes(router)) {
+                    rounterMap.push(router)
+                  }
+                }
+              })
             })
           })
 

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

@@ -35,10 +35,12 @@ const user = {
       const username = data.username.trim()
       return new Promise((resolve, reject) => {
         login(username, data.password, data.communityId).then(response => {
-          const data = response.data
-          console.log('登陆后的数据的Token', data.token)
-          setToken(data.token)
-          commit('SET_TOKEN', data.token)
+          console.log('login: ', response)
+          if (response.code === '0') {
+            const data = response.data
+            setToken(data.token)
+            commit('SET_TOKEN', data.token)
+          }
           resolve(response)
         }).catch(error => {
           reject(error)
@@ -51,11 +53,12 @@ const user = {
       return new Promise((resolve, reject) => {
         getInfo().then(response => {
           const data = response.data
-          if (data.roles && data.roles.length > 0) { // 验证返回的roles是否是一个非空数组
-            commit('SET_ROLES', data.roles)
-          } else {
-            reject('getInfo: roles must be a non-null array !')
-          }
+          // if (data.roles && data.roles.length > 0) { // 验证返回的roles是否是一个非空数组
+          //   commit('SET_ROLES', data.roles)
+          // } else {
+          //   reject('getInfo: roles must be a non-null array !')
+          // }
+          commit('SET_ROLES', data.roles)
           commit('SET_NAME', data.userName)
           commit('SET_AVATAR', data.loginName)
           commit('SET_USER_DATA', data)

VUECODE/smart-property-manage/src/views/account/add/role-add.vue

@@ -11,11 +11,10 @@
         <el-tree
           ref="tree"
           :data="menuList"
+          :props="defaultProps"
           show-checkbox
-          node-key="id"
-          :props="defaultProps">
-        </el-tree>
-      </el-form-item> 
+          node-key="id"/>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="submitForm('ruleForm')">立即创建</el-button>
         <el-button @click="resetForm('ruleForm')">重置</el-button>
@@ -47,7 +46,6 @@ export default {
           { required: true, message: '请输入角色名称', trigger: 'blur' }
         ],
         menuArray: [
-          { type: 'array', required: true, message: '请至少选择一个活动性质', trigger: 'change' }
         ]
       },
       defaultProps: {
@@ -56,7 +54,7 @@ export default {
       }
     }
   },
-  created(){
+  created() {
     this.getMenuList()
   },
   methods: {
@@ -69,7 +67,10 @@ export default {
     submitForm(formName) { // 提交
       // 获取选中的树形节点 key
       this.ruleForm.menuArray = this.$refs.tree.getCheckedKeys()
-      console.log(this.ruleForm.menuArray)
+      if (this.ruleForm.menuArray.length < 1) {
+        this.$message.error('请至少选择一个菜单权限')
+        return
+      }
       this.$refs[formName].validate((valid) => {
         if (valid) {
           this.addRole()

VUECODE/smart-property-manage/src/views/account/edit/role-edit.vue

@@ -11,13 +11,12 @@
         <el-tree
           ref="tree"
           :data="menuList"
-          show-checkbox
-          node-key="id"
           :default-expanded-keys="ruleForm.menuArray"
           :default-checked-keys="ruleForm.menuArray"
-          :props="defaultProps">
-        </el-tree>
-      </el-form-item> 
+          :props="defaultProps"
+          show-checkbox
+          node-key="id"/>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="submitForm('ruleForm')">修改</el-button>
         <el-button @click="resetForm('ruleForm')">重置</el-button>
@@ -50,7 +49,7 @@ export default {
           { required: true, message: '请输入角色名称', trigger: 'blur' }
         ],
         menuArray: [
-          { type: 'array', required: true, message: '请至少选择一个活动性质', trigger: 'change' }
+          // { type: 'array', required: true, message: '请至少选择一个菜单权限', trigger: 'change' }
         ]
       },
       defaultProps: {
@@ -59,7 +58,7 @@ export default {
       }
     }
   },
-  created(){
+  created() {
     this.ruleForm.id = this.$route.params.id
     this.getDataById()
     this.getMenuList()
@@ -76,6 +75,11 @@ export default {
       // 获取选中的树形节点 key
       this.ruleForm.menuArray = this.$refs.tree.getCheckedKeys()
       console.log(this.ruleForm.menuArray)
+      if (this.ruleForm.menuArray.length < 1) {
+        this.$message.error('请至少选择一个菜单权限')
+        return
+      }
+      console.log(this.ruleForm.menuArray)
       this.$refs[formName].validate((valid) => {
         if (valid) {
           this.updateRole()

VUECODE/smart-property-manage/src/views/account/role.vue

@@ -10,7 +10,7 @@
       <el-button type="warning" @click="editRole">修改</el-button>
       <el-button type="danger" @click="deleteRole">删除</el-button>
     </div>
-    
+
     <el-table
       v-loading="listLoading"
       :key="tableKey"
@@ -123,7 +123,7 @@ export default {
       this.FetchRoleList(this.listQuery).then(() => {
         this.listLoading = false
       }).catch(() => {
-        this.loading = false
+        this.listLoading = false
         console.log('get list error')
       })
     },

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

@@ -1,7 +1,7 @@
 <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-form-item label="姓名" prop="userName">
         <el-input v-model="ruleForm.userName"/>
       </el-form-item>
      <el-form-item class="filter-item" label="手机号" prop="loginName" >
@@ -55,7 +55,7 @@ export default {
       },
       rules: {
         userName: [
-          { required: true, message: '名称', trigger: 'blur' }
+          { required: true, message: '请输入姓名', trigger: 'blur' }
         ],
         loginName: [
           { required: true, message: '请输入手机号', trigger: 'blur' }

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

@@ -1,7 +1,7 @@
 <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-form-item label="姓名" prop="userName">
           <el-input v-model="ruleForm.userName"/>
        </el-form-item>
     
@@ -55,9 +55,8 @@ export default {
         children: 'children'
       },
       rules: {
-        roleName: [
-            { required: true, message: '请输入活动名称', trigger: 'blur' },
-            { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
+        userName: [
+            { required: true, message: '请输入姓名', trigger: 'blur' }
           ],
         loginName: [
           { required: true, message: '请输入手机号', trigger: 'blur' }