修复 bug

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());

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;
+
 	/**
 	 * 获取角色列表
 	 *
@@ -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

@@ -76,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();
         // 查询该用户的权限

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/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)