调整

eladmin-web/src/views/bus/busUser/index.vue

@@ -41,20 +41,20 @@
                 </el-image>
               </template>
             </el-table-column>
-            <el-table-column prop="phone" label="手机号码" />
+            <!-- <el-table-column prop="phone" label="手机号码" />-->
             <el-table-column prop="status" label="状态">
               <template slot-scope="scope">
                 <span v-if="scope.row.status==1" style="color: #13ce66">正常</span>
                 <span v-else style="color: #ff6d6d">禁止</span>
               </template>
             </el-table-column>
-            <el-table-column prop="sex" label="性别">
+            <!--<el-table-column prop="sex" label="性别">
               <template slot-scope="scope">
                 <span v-if="scope.row.sex==0">未知</span>
                 <span v-else-if="scope.row.sex==1">男</span>
                 <span v-else>女</span>
               </template>
-            </el-table-column>
+            </el-table-column>-->
             <el-table-column prop="createTime" label="创建时间" />
             <el-table-column v-if="checkPer(['admin','busUser:edit','busUser:del'])" label="操作" width="150px" align="center">
               <template slot-scope="scope">

eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/BusUserDeviceServiceImpl.java

@@ -47,7 +47,10 @@ public class BusUserDeviceServiceImpl extends ServiceImpl<BusUserDeviceMapper, B
     @Transactional(rollbackFor = Exception.class)
     public void updUserCommands(BusUser busUser) {
         List<BusTreeVo> commands = busUser.getCommands();
-        if (null == commands || commands.isEmpty()) { return; }
+        if (null == commands || commands.isEmpty()) {
+            busUserDeviceMapper.delete(new QueryWrapper<BusUserDevice>().eq("user_id", busUser.getId()));
+            return;
+        }
         List<BusTreeVo> userDevices = commands.stream().filter(i -> i.getId().contains("d")).collect(Collectors.toList());
         List<BusTreeVo> userCommands = commands.stream().filter(i -> i.getId().contains("c")).collect(Collectors.toList());
         List<BusUserDevice> oldUserDevices = busUserDeviceMapper.selectList(new QueryWrapper<BusUserDevice>().eq("user_id", busUser.getId()));

eladmin/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java

@@ -136,6 +136,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         if(!resources.getEnabled()){
             onlineUserService.kickOutForUsername(resources.getUsername());
         }
+        // 清除缓存
+        delCaches(user.getId(), user.getUsername());
         user.setDeptId(resources.getDept().getId());
         user.setUsername(resources.getUsername());
         user.setEmail(resources.getEmail());
@@ -147,8 +149,6 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         user.setNickName(resources.getNickName());
         user.setGender(resources.getGender());
         saveOrUpdate(user);
-        // 清除缓存
-        delCaches(user.getId(), user.getUsername());
         // 更新用户岗位
         userJobMapper.deleteByUserId(resources.getId());
         userJobMapper.insertData(resources.getId(), resources.getJobs());