1.分公司权限

tangzy

2021-11-15 bc1f282f1cc9bdad3225ec8d1acea44d7835aba6

 src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java

@@ -188,6 +188,25 @@
         } else {
            userVO.setAge(null);
         }
         if (null!=userVO.getDeptId()) {
            List<String> list = baseMapper.getDeptName(userVO.getDeptId());
            if (list.size() > 1) {
               if (null != list.get(1) && list.get(1) != "") {
                  String s = list.get(1).toString();
                  if (s.equals("本市保安公司") || s.equals("保安培训学校") || s.equals("自招保安单位") || s.equals("武装押运公司") || s.equals("分公司") || s.equals("其他")){
                     userVO.setDeptName(list.get(0));
                  }
                  else {
                     userVO.setDeptName(list.get(1) + "," + list.get(0));
                  }
               } else {
                  userVO.setDeptName(list.get(0));
               }
            }
            if (list.size() == 1) {
               userVO.setDeptName(list.get(0));
            }
         }
      });
      return page.setRecords(userVOS);
   }
@@ -715,13 +734,13 @@
            treeNode.setParentId(Long.parseLong(user.getDeptId()));
            tree.get(0).getChildren().add(treeNode);
         }
         //获取子节点
         List<TreeNode> children = tree.get(0).getChildren();
         //排序
         List<TreeNode> nodes = children.stream().sorted(Comparator.comparing(TreeNode::getId)).collect(Collectors.toList());
         //设置排序后的集合
         tree.get(0).setChildren(nodes);
      }
      //获取子节点
      List<TreeNode> children = tree.get(0).getChildren();
      //排序
      List<TreeNode> nodes = children.stream().sorted(Comparator.comparing(TreeNode::getId)).collect(Collectors.toList());
      //设置排序后的集合
      tree.get(0).setChildren(nodes);
      //返回
      return tree;
   }
@@ -854,26 +873,60 @@
            //新增
            this.save(user);
            //内网同步
//            String s = "insert into blade_user(" +
//               "id,tenant_id,account,password,real_name,phone,sex,role_id,dept_id," +
//               "cardid,nation,registered,securitynumber,hold,status,is_deleted) " +
//               "values(" + "'" + user.getId() + "'" + "," +
//               "'" + user.getTenantId() + "'" + "," +
//               "'" + user.getAccount() + "'" + "," +
//               "'" + user.getPassword() + "'" + "," +
//               "'" + user.getRealName() + "'" + "," +
//               "'" + user.getPhone() + "'" + "," +
//               "'" + user.getSex() + "'" + "," +
//               "'" + user.getRoleId() + "'" +
//               "," + "'" + user.getDeptId() + "'" +
//               "," + "'" + user.getCardid() + "'" +
//               "," + "'" + user.getNation() + "'" +
//               "," + "'" + user.getRegistered() + "'" +
//               "," + "'" + user.getSecuritynumber() + "'" +
//               "," + "'" + user.getHold() + "'" +
//               "," + "'" + user.getStatus() + "'" +
//               "," + "'" + user.getIsDeleted() + "'"
//               + ")";
            String s = "insert into blade_user(" +
               "id,tenant_id,account,password,real_name,phone,sex,role_id,dept_id," +
               "cardid,nation,registered,securitynumber,hold,status,is_deleted) " +
               "values(" + "'" + user.getId() + "'" + "," +
               "'" + user.getTenantId() + "'" + "," +
               "'" + user.getAccount() + "'" + "," +
               "'" + user.getPassword() + "'" + "," +
               "'" + user.getRealName() + "'" + "," +
               "'" + user.getPhone() + "'" + "," +
               "'" + user.getSex() + "'" + "," +
               "'" + user.getRoleId() + "'" +
               "id,tenant_id,account,password,name,real_name,avatar,email,phone,sex," +
               "role_id,dept_id,cardid,nativePlace,nation,fingerprint,education," +
               "politicaloutlook,healstats,height,address,registered," +
               "securitynumber,hold,jurisdiction,examination_type,status,is_deleted,dispatch) " +
               "values(" + "'" + user.getId() + "'" +
               "," + "'" + user.getTenantId() + "'" +
               "," + "'" + user.getAccount() + "'" +
               "," + "'" + user.getPassword() + "'" +
               "," + "'" + user.getName() + "'" +
               "," + "'" + user.getRealName() + "'" +
               "," + "'" + user.getAvatar() + "'" +
               "," + "'" + user.getEmail() + "'" +
               "," + "'" + user.getPhone() + "'" +
               "," + "'" + user.getSex() + "'" +
               "," + "'" + user.getRoleId() + "'" +
               "," + "'" + user.getDeptId() + "'" +
               "," + "'" + user.getCardid() + "'" +
               "," + "'" + user.getNativeplace() + "'" +
               "," + "'" + user.getNation() + "'" +
               "," + "'" + user.getFingerprint() + "'" +
               "," + "'" + user.getEducation() + "'" +
               "," + "'" + user.getPoliticaloutlook() + "'" +
               "," + "'" + user.getHealstats() + "'"+
               "," + "'" + user.getHeight() + "'" +
               "," + "'" + user.getAddress() + "'" +
               "," + "'" + user.getRegistered() + "'" +
               "," + "'" + user.getSecuritynumber() + "'" +
               "," + "'" + user.getHold() + "'" +
               "," + "'" + user.getJurisdiction() + "'" +
               "," + "'" + user.getExaminationType() + "'" +
               "," + "'" + user.getStatus() + "'" +
               "," + "'" + user.getIsDeleted() + "'"
               + ")";
               "," + "'" + user.getIsDeleted() + "'" +
               "," + "'" + user.getDispatch() + "'" + ")";
            FtpUtil.sqlFileUpload(s);
         }else {
            //匹配组织机构是否一致,如果不一致
@@ -921,6 +974,44 @@
   }


//   /**
//    * 导入保安员（测试，用来更新数据用）
//    *
//    * @param data
//    * @param isCovered
//    */
//   @Override
////   @Transactional(rollbackFor = Exception.class)
//   public void importSecurity(List<SecurityExcel> data, Boolean isCovered, String deptId) {
//      //将不能导入的保安员账号存起来
//      List<String> errorList = new ArrayList<>();
//      //导入状态，默认为true ,如果有一个出现问题则为 false
//      AtomicBoolean status = new AtomicBoolean(true);
//      data.forEach(userExcel -> {
//         //判断当前用户是否已在本单位，如果是的更新数据
//         User user1 = new User();
//         user1.setAccount(userExcel.getCardid());
//         user1.setIsDeleted(0);
//         user1.setStatus(1);
//         User user2 = this.getOne(Condition.getQueryWrapper(user1));
//         if (null!=user2){
//            if (null!=userExcel.getRegistered() && userExcel.getRegistered()!=""){
//               user2.setRegistered(userExcel.getRegistered());
//               user2.setUserType(7);
//            }
//            this.updateById(user2);
//         }else {
//            errorList.add(userExcel.getCardid());
//         }
//      });
//      //如果所有数据导入有一个异常
//      if (!status.get()){
//         String errorAccount = StringUtils.join(errorList, "\\\n");
//         throw new ServiceException("用户:["+errorAccount+"]导入失败!已在其他单位存在!");
//      }
//   }


   /**
    * 根据保安员编码查询保安信息
    *