1、导出用户修改

zengh

2022-12-07 21777298b82264970d6fd1b30f3ba1d06b641d27

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

@@ -368,13 +368,24 @@
   @GetMapping("export-user")
   @ApiOperationSupport(order = 13)
   @ApiOperation(value = "导出用户", notes = "传入user")
   public void exportUser(@ApiIgnore @RequestParam Map<String, Object> user, BladeUser bladeUser, HttpServletResponse response) {
      QueryWrapper<User> queryWrapper = Condition.getQueryWrapper(user, User.class);
      if (!AuthUtil.isAdministrator()) {
         queryWrapper.lambda().eq(User::getTenantId, bladeUser.getTenantId());
   public void exportUser(@ApiIgnore @RequestParam Map<String, String> user, BladeUser bladeUser, HttpServletResponse response) {
//      QueryWrapper<User> queryWrapper = Condition.getQueryWrapper(user, User.class);
      User users = new User();
      if (user.get("realName")!=null&&!user.get("realName").equals("")){
         users.setRealName(user.get("realName").trim());
      }
      queryWrapper.lambda().eq(User::getIsDeleted, BladeConstant.DB_NOT_DELETED);
      List<UserExcel> list = userService.exportUser(queryWrapper);
      if (user.get("jurisdiction")!=null&&!user.get("jurisdiction").equals("")){
         users.setJurisdiction(user.get("jurisdiction").trim());
      }
      if (user.get("workjurisdiction")!=null&&!user.get("workjurisdiction").equals("")){
         users.setWorkjurisdiction(user.get("workjurisdiction").trim());
      }

//      if (!AuthUtil.isAdministrator()) {
//         queryWrapper.lambda().eq(User::getTenantId, bladeUser.getTenantId());
//      }
//      queryWrapper.lambda().eq(User::getIsDeleted, BladeConstant.DB_NOT_DELETED);
      List<UserExcel> list = userService.exportUser(users);
      ExcelUtil.export(response, "用户数据" + DateUtil.time(), "用户数据表", list, UserExcel.class);
   }

@@ -502,11 +513,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 +618,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 +680,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);