保安员，保安公司查询修改

Administrator

2021-08-31 61e8c756cc2a9e503d643672f103c3837fadc1d4

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

@@ -180,17 +180,17 @@
   public R submit(@Valid @RequestBody User user) throws Exception {
      CacheUtil.clear(USER_CACHE);
      //查询角色
      if (null!=user.getRoleId()){
         Role role = new Role();
         role.setId(Long.parseLong(user.getRoleId()));
         Role one = roleService.getOne(Condition.getQueryWrapper(role));
         if (one.getRoleAlias().equals("保安")){
            user.setHold("1");
         }
         if (one.getRoleAlias().equals("未持证保安")){
            user.setHold("2");
         }
      }
//      if (null!=user.getRoleId()){
//         Role role = new Role();
//         role.setId(Long.parseLong(user.getRoleId()));
//         Role one = roleService.getOne(Condition.getQueryWrapper(role));
//         if (one.getRoleAlias().equals("保安")){
//            user.setHold("1");
//         }
//         if (one.getRoleAlias().equals("未持证保安")){
//            user.setHold("2");
//         }
//      }

      //根据 deptId 查询dept信息,公安管理员
      Dept dept = iDeptService.getById(user.getDeptId());
@@ -203,13 +203,16 @@
         user.setJurisdiction(one.getId().toString());
      }
      userService.submit(user);
      String birthday = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getBirthday());
      String rtime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getRtime());
      //      String birthday = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getBirthday());
      String rtime = null;
      if (null!=user.getRtime()) {
         rtime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getRtime());
      }
      String s = "insert into blade_user(id,tenant_id,account,password,name,real_name,avatar,email,phone,birthday,sex,role_id,dept_id,cardid,nativePlace,nation,education," +
         "politicaloutlook,healstats,height,address,registered,rtime,securitynumber,hold,jurisdiction) " +
         "values(" + "'" + user.getId() + "'" + "," + "'" + 000000 + "'" + "," + "'" + user.getAccount() + "'" + "," +
         "'" + user.getPassword() + "'" + "," +"'" + user.getName() + "'" + "," + "'" + user.getRealName() + "'" + "," + "'" + user.getAvatar() + "'" + "," +
         "'" + user.getEmail() + "'" + "," + "'" + user.getPhone() + "'" + "," + "'" + birthday + "'" + "," + "'" + user.getSex() + "'" + "," + "'" + user.getRoleId() + "'" +
         "'" + user.getEmail() + "'" + "," + "'" + user.getPhone() + "'" + "," + "'" + user.getSex() + "'" + "," + "'" + user.getRoleId() + "'" +
         "," + "'" + user.getDeptId() + "'" + "," + "'" + user.getCardid() + "'" + "," + "'" + user.getNativeplace() + "'" + "," + "'"
         + user.getNation() + "'" + "," + "'" + user.getEducation() + "'" + "," + "'" + user.getPoliticaloutlook() + "'" + "," + "'" + user.getHealstats() + "'"
         + "," +"'" + user.getHeight() + "'" + "," + "'" + user.getAddress() + "'" +"," + "'" + user.getRegistered() + "'"+ "," +
@@ -348,7 +351,7 @@
   }

   /**
    * 导入用户
    * 导入用户page-security-apply
    */
   @PostMapping("import-user")
   @ApiOperationSupport(order = 12)
@@ -566,24 +569,24 @@
      //获取user
      User user = JSON.parseObject(JSON.toJSONString(userMap.get("user")),User.class);
      //判断是否为空
      if (null!=user.getHold()){
//      if (null!=user.getHold()){
         //持证
         if (user.getHold().equals("1")){
//         if (user.getHold().equals("1")){
            //分配保安角色
            Role role = new Role();
            role.setRoleAlias("保安");
            Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
            user.setRoleId(oneRole.getId().toString());
         }
//         }
         //未持证
         if (user.getHold().equals("2")){
            //分配未持证保安角色
            Role role = new Role();
            role.setRoleAlias("未持证保安");
            Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
            user.setRoleId(oneRole.getId().toString());
         }
      }
//         if (user.getHold().equals("2")){
//            //分配未持证保安角色
//            Role role = new Role();
//            role.setRoleAlias("未持证保安");
//            Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
//            user.setRoleId(oneRole.getId().toString());
//         }
//      }
      //密码加密
      if (Func.isNotEmpty(user.getPassword())) {
         user.setPassword(DigestUtil.encrypt(user.getPassword()));
@@ -651,5 +654,19 @@
   }


   /**
    *
    * @param type  1:保安 2:公安
    * @param deptid
    * @param jurisdiction
    * @return
    */
   @GetMapping("/seleL")
   public R seleL(String type,String deptid, String jurisdiction,Long userId) {
      List<Map<String, Object>> list = userService.seleL(type,deptid, jurisdiction,userId);
      return R.data(list);
   }



}