提交

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

@@ -136,6 +136,17 @@ public class ToUserServerImpl implements IToUserService {
         ToUser toUser= new ToUser();
 
         String loginName= object.getString("loginName");
+
+        if (!AccountValidatorUtil.isPhone(loginName)){
+            response.addError("请输入正确的手机号!");
+            return response;
+        }
+        ToUser userLoginName= toUserMapper.selectByLoginName(loginName);
+            if (null!=userLoginName && null != userLoginName.getLoginName()) {
+                response.addError("您输入的手机号已存在");
+                return response;
+            }
+
         String userName = object.getString("userName");
         JSONArray List = object.getJSONArray("menuArray");
         Integer[] roleIDArray = List.toArray(new Integer[]{});
@@ -167,32 +178,46 @@ public class ToUserServerImpl implements IToUserService {
         ToUser toUser = new ToUser();
 
         String loginName = object.getString("loginName");
-        Integer ID= object.getInteger("id");
-        String userName = object.getString("userName");
-        JSONArray List = object.getJSONArray("menuArray");
-        Integer[] roleIDArray = List.toArray(new Integer[]{});
-        String remark = object.getString("remark");
-
-        toUser.setUserName(userName);
-        toUser.setLoginName(loginName);
-        toUser.setRemark(remark);
-        toUser.setStatus("1");
-        toUser.setId(ID);
-        toUser.setUpdateUser(userID);
-        toUser.setUpdateDate(new Date());
-        toUserMapper.updateByPrimaryKeySelective(toUser);
 
-        //会对应多个角色
-        if (null!=List) {
-            toSysUserRoleMapper.deleteRole(ID);
-            for (Integer roleID : roleIDArray) {
-                ToSysUserRole toSysUserRole = new ToSysUserRole();
-                toSysUserRole.setUserId(toUser.getId());
-                toSysUserRole.setRoleId(roleID);
-                toSysUserRoleMapper.insert(toSysUserRole);
+        if (!AccountValidatorUtil.isPhone(loginName)){
+            response.addError("请输入正确的手机号!");
+            return response;
+        }
+        ToUser userLoginName= toUserMapper.selectByLoginName(loginName);
+        // 修改手机号排除自身
+        if (null!=userLoginName && null != userLoginName.getLoginName()) {
+            if (loginName.equals(userLoginName.getLoginName())){
+                Integer ID= object.getInteger("id");
+                String userName = object.getString("userName");
+                JSONArray List = object.getJSONArray("menuArray");
+                Integer[] roleIDArray = List.toArray(new Integer[]{});
+                String remark = object.getString("remark");
+
+                toUser.setUserName(userName);
+                toUser.setLoginName(loginName);
+                toUser.setRemark(remark);
+                toUser.setStatus("1");
+                toUser.setId(ID);
+                toUser.setUpdateUser(userID);
+                toUser.setUpdateDate(new Date());
+                toUserMapper.updateByPrimaryKeySelective(toUser);
+
+                //会对应多个角色
+                if (null!=List) {
+                    toSysUserRoleMapper.deleteRole(ID);
+                    for (Integer roleID : roleIDArray) {
+                        ToSysUserRole toSysUserRole = new ToSysUserRole();
+                        toSysUserRole.setUserId(toUser.getId());
+                        toSysUserRole.setRoleId(roleID);
+                        toSysUserRoleMapper.insert(toSysUserRole);
+                    }
+                }
             }
+            response.addSuccess("成功");
+            return response;
         }
-        response.addSuccess("成功");
+
+        response.addError("您输入的手机号已存在");
         return response;
     }
 
@@ -229,7 +254,7 @@ public class ToUserServerImpl implements IToUserService {
         }
         toUser.setUpdateUser(userID);
         toUser.setUpdateDate(new Date());
-        toUserMapper.updateByPrimaryKey(toUser);
+        toUserMapper.updateByPrimaryKeySelective(toUser);
         response.addSuccess("成功");
         return response;
     }

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

@@ -125,6 +125,9 @@
   <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.ToUser" >
     update to_user
     <set >
+      <if test="id != null" >
+       id = #{id,jdbcType=INTEGER},
+      </if>
       <if test="userName != null" >
         user_name = #{userName,jdbcType=VARCHAR},
       </if>
@@ -187,10 +190,10 @@
     SELECT
     sr.role_name,
     sr.description,
-    sr.create_user,
-    sr.create_date,
-    sr.update_date,
-    sr.update_user,
+    tu.create_user,
+    tu.create_date,
+    tu.update_date,
+    tu.update_user,
     tu.user_name,
     tu.remark,
     tu.login_name,
@@ -200,7 +203,6 @@
     to_user tu
     LEFT JOIN to_sys_user_role ON tu.id = to_sys_user_role.user_id
     LEFT JOIN to_sys_role sr ON to_sys_user_role.role_id = sr.id
-    group by to_sys_user_role.user_id
     <where>
     <if test="loginName != null and loginName !=''" >
       and tu.login_name = #{loginName,jdbcType=VARCHAR}
@@ -209,6 +211,8 @@
       and tu.user_name like concat('%',#{userName,jdbcType=VARCHAR},'%')
     </if>
     </where>
+    group by to_sys_user_role.user_id
+    order by  tu.create_date desc
   </select>
 
   <select id="selectByIdUserName" parameterType="int" resultType="string">

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

@@ -35,7 +35,8 @@
             </if>
             and  tu.community_id=#{communityId,jdbcType=INTEGER}
         </where>
-        GROUP BY tp_sys_user_role.user_id
+        group by tp_sys_user_role.user_id
+        order by  tu.create_date desc
     </select>
 
     <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.User" >

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

@@ -54,7 +54,7 @@ export default {
         children: 'children'
       },
       rules: {
-        roleName: [
+        userName: [
           { required: true, message: '名称', trigger: 'blur' }
         ],
         loginName: [
@@ -69,6 +69,7 @@ export default {
   },
   methods: {
     submitForm(formName) {
+      
       // 获取选中的树形节点 key
       this.ruleForm.menuArray = this.$refs.tree.getCheckedKeys()
       this.$refs[formName].validate((valid) => {
@@ -81,6 +82,12 @@ export default {
         if (valid) {
           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
+            }
             const resCode = res.code
             this.ruleForm.id=''
             if (resCode === '0') {
@@ -90,6 +97,8 @@ export default {
               })
               loading.close()
               this.$router.push({ name: 'user-index' })
+            }else{
+              this.$message.error(res.message)
             }
           }).catch(() => {
             console.log('error AddUser')

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

@@ -54,7 +54,7 @@ export default {
         children: 'children'
       },
       rules: {
-        roleName: [
+        userName: [
           { required: true, message: '名称', trigger: 'blur' }
         ],
         loginName: [
@@ -81,8 +81,15 @@ export default {
           background: 'rgba(0, 0, 0, 0.7)'
         })
         if (valid) {
+          if(this.ruleForm.menuArray.length<=0){
+               this.$message.error('请选择角色')
+               loading.close()
+               console.log('this.ruleForm.menuArray',this.ruleForm.menuArray)
+               return
+            }
           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-operate-manage/src/views/account/user/index.vue

@@ -36,12 +36,12 @@
       <el-table-column prop="updateNmae" label="修改人" align="center"/>
       <el-table-column prop="updateDate" label="修改时间" align="center" ><template slot-scope="scope">{{ formatDate(scope.row.updateDate) }}</template></el-table-column>
       <el-table-column prop="id" label="操作" align="center">
-          <template slot-scope="scope"><a><span style="color: #63B8FF" @click="upDateStatus(scope.row.id,scope.row.status)">{{ scope.row.status =='1' ? '停用账号':'启用账号' }}</span></a></template>
+        <template slot-scope="scope"><a><span style="color: #63B8FF" @click="upDateStatus(scope.row.id,scope.row.status)">{{ scope.row.status =='1' ? '停用账号':'启用账号' }}</span></a></template>
       <!-- <a><template slot-scope="scope">
           <span v-if="scope.row.status==1">{{ '停用账号' }}</span>
           <span v-if="scope.row.status==0">{{ '启用账号' }}</span>
      </template></a> -->
-          </el-table-column>
+      </el-table-column>
     </el-table>
     <div class="block">
       <el-pagination
@@ -65,12 +65,12 @@ export default {
       listQuery: {
         id: '',
         userName: '',
-        loginName:'',
+        loginName: '',
         roleName: '',
         createUser: '',
         updateUser: '',
         updateDate: '',
-        status : '',
+        status: '',
         pageNum: 1,
         pageSize: 10
       },
@@ -128,7 +128,7 @@ export default {
     dataQuery() { // 查询数据
       this.listLoading = true
       this.$store.dispatch('EmployeesList', this.listQuery).then((res) => {
-         this.listDate = res.item
+        this.listDate = res.item
         this.list = res.item
         this.total = res.total
         this.listLoading = false
@@ -136,11 +136,9 @@ export default {
         this.listLoading = false
         console.log('error EmployeesList')
       })
-      
     },
     handleSelectionChange(data) {
-      // 设置为 空
-      this.deleteIds = []
+      this.deleteIds = [] // 设置为 空
       for (let i = 0; i < data.length; i++) {
         this.deleteIds.push(data[i].id)
       }
@@ -175,6 +173,15 @@ export default {
      this.listQuery.id=''
     },
     upDate(){
+          const deleteIds = this.deleteIds
+      if (deleteIds.length > 1) {
+        this.$message.error('只能选择一行数据进行修改!')
+        return
+      }
+      if (deleteIds < 1) {
+        this.$message.error('请选择一行数据进行修改!')
+        return
+      }
       //  this.$router.push({ name: 'user-edit' })
        const ids = this.deleteIds[0]
           this.$router.push({ name: 'user-edit', params: { id: ids }})

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

@@ -94,7 +94,7 @@ export default {
               loading.close()
                return
             }
-          if(this.ruleForm.menuArray[0]<0){
+          if(this.ruleForm.menuArray<0){
               this.$message.error('请您选择角色!')
               loading.close()
                return

VUECODE/smart-property-manage/src/views/building/add/index.vue

@@ -65,7 +65,7 @@ export default {
         ownerTel: [
           { required: true, message: '请输入手机号', trigger: 'blur' },
           { min: 11, max: 11, required: true, message: '请输入11位手机号', trigger: 'blur' }
-        ]
+        ],
       }
     }
   },