1、增加轮播图维护 2、修复队伍接口报错

zengh

2022-09-29 adcff04c70567f4b1e74ec2c8dcecbb5164f94ec

 src/main/java/org/springblade/modules/system/controller/UserController.java

@@ -502,11 +502,11 @@
      User user = JSON.parseObject(JSON.toJSONString(userMap.get("user")), User.class);

      //数据脱敏处理
      user.setAccount(user.getRealName().substring(0,1)+user.getCardid().substring(user.getCardid().length()-4));
      user.setCardid(DesensitizedUtil.desensitizedIdNumber(user.getCardid()));
      user.setPhone(DesensitizedUtil.desensitizedPhoneNumber(user.getPhone()));
      user.setName(DesensitizedUtil.desensitizedName(user.getName()));
      user.setRealName(DesensitizedUtil.desensitizedName(user.getRealName()));
//      user.setAccount(user.getRealName().substring(0,1)+user.getCardid().substring(user.getCardid().length()-4));
//      user.setCardid(DesensitizedUtil.desensitizedIdNumber(user.getCardid()));
//      user.setPhone(DesensitizedUtil.desensitizedPhoneNumber(user.getPhone()));
//      user.setName(DesensitizedUtil.desensitizedName(user.getName()));
//      user.setRealName(DesensitizedUtil.desensitizedName(user.getRealName()));


      Integer userCount = userService.selectCount(user.getAccount());
@@ -607,27 +607,57 @@
      boolean status = false;
      if (null!=one){
         //修改
         if (null!= one.getAccount()) {
         if (null!= user.getAccount()) {
            one.setAccount(user.getAccount());
         }
         if (null!= one.getCardid()) {
         if (null!= user.getCardid()) {
            one.setCardid(user.getCardid());
         }
         if (null!= one.getPassword()) {
         if (null!= user.getPassword()) {
            one.setPassword(user.getPassword());
         }
         if (null!= one.getAvatar()) {
            one.setAvatar(user.getAvatar());
         }
         if (null!= one.getPhone()) {
         if (null!= user.getPhone()) {
            one.setPhone(user.getPhone());
         }
         if (null!= one.getRealName()) {
         if (null!= user.getRealName()) {
            one.setRealName(user.getRealName());
         }
         one.setUpdateTime(new Date());
         //用户修改
          status = userService.updateById(one);
      }else {
         User user2 = new User();
         //如果没有，则插入一条
         if (null!= user.getAccount()) {
            user2.setAccount(user.getAccount());
         }
         if (null!= user.getCardid()) {
            user2.setCardid(user.getCardid());
         }
         if (null!= user.getPassword()) {
            user2.setPassword(user.getPassword());
         }
         if (null!= user.getPhone()) {
            user2.setPhone(user.getPhone());
         }
         if (null!= user.getRealName()) {
            user2.setRealName(user.getRealName());
         }
         if (null!= user.getSex()) {
            user2.setSex(user.getSex());
         }
         user2.setStatus(1);
         user2.setIsDeleted(0);
         user2.setRoleId("1495714343888039937");
         user2.setDeptId("1424615972718895106");
         user2.setStype("1");
         user2.setTenantId("000000");
         user2.setCreateTime(new Date());
         user2.setUpdateTime(new Date());
         user2.setSecurityId(user.getSecurityId());
         user2.setId(null);
         //新增
         status = userService.save(user2);
      }
      //返回
      return R.status(status);
@@ -639,18 +669,19 @@
   @PostMapping("/removeSecurity")
   @Transactional(rollbackFor = Exception.class)
   public R removeSecurity(@RequestBody User user) {
      System.out.println("保安员开始删除 = " + user);
      User user1 = new User();
      user1.setIsDeleted(0);
      user1.setStatus(1);
      user1.setSecurityId(user.getSecurityId());
      user1.setSecurityId(user.getId().toString());
//      user1.setCardid(user.getCardid());
      User one = userService.getOne(Condition.getQueryWrapper(user1));
      boolean status = false;
      if (null!=one){
         //修改
         one.setIsDeleted(1);
         System.out.println("查询到保安员 = " + one);
         //用户修改
         status = userService.removeById(one.getId());
         System.out.println("保安员删除状态： = " + status);
      }
      //返回
      return R.status(status);