Merge remote-tracking branch 'origin/master'

tianhu-system/src/main/java/com/tianhu/system/controller/SysDeptController.java

@@ -124,11 +124,11 @@ public class SysDeptController extends BaseController
         //查询自己企业部门
         List<SysDept> depts = deptService.selectDeptList(dept);
         //判断是否为运维管理员 000000：代表运维管理员
-        if(SalaryConstants.OPEX.equals(companyId)){
-            //查询其他企业一级部门
-            List<SysDept> companyDepts = deptService.selectCompanyDeptList(dept);
-            depts.addAll(companyDepts);
-        }
+//        if(SalaryConstants.OPEX.equals(companyId)){
+//            //查询其他企业一级部门
+//            List<SysDept> companyDepts = deptService.selectCompanyDeptList(dept);
+//            depts.addAll(companyDepts);
+//        }
         List<TreeSelect> treeList = new ArrayList<>();
         List<TreeSelect> list = deptService.buildDeptTreeSelect(depts);
         return AjaxResult.success(list);
@@ -163,6 +163,11 @@ public class SysDeptController extends BaseController
     @PostMapping
     public AjaxResult add(@Validated @RequestBody SysDept dept)
     {
+        LoginUser userInfo = tokenService.getLoginUser();
+        SysUser user = userInfo.getSysUser();
+        String company = user.getCompanyId();
+
+        dept.setCompanyId(company);
         String email = dept.getEmail();
         if(!CommonUtil.isEmpty(email)){
             String check = "^([a-z0-9A-Z]+[-|_|\\.]?)+[a-z0-9A-Z]@([a-z0-9A-Z]+(-[a-z0-9A-Z]+)?\\.)+[a-zA-Z]{2,}$";
@@ -178,24 +183,20 @@ public class SysDeptController extends BaseController
             return AjaxResult.error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
         }
         dept.setCreateBy(SecurityUtils.getUsername());
-        LoginUser userInfo = tokenService.getLoginUser();
-        SysUser user = userInfo.getSysUser();
-        String company = user.getCompanyId();
-        Long number = new Long(0);
+//        Long number = new Long(0);
 
-        if(!SalaryConstants.OPEX.equals(company)){
-            dept.setCompanyId(company);
+//        if(!SalaryConstants.OPEX.equals(company)){
             if(dept.getParentId() == null){
                 return AjaxResult.error("新增部门'" + dept.getDeptName() + "'失败，上级部门不能为空");
             }
-        }else{
-            dept.setCompanyId(company);
-            if(dept.getParentId() == null){
-                dept.setParentId(number);
-                dept.setAncestors("0");
-            }
+//        }else{
+//            dept.setCompanyId(company);
+//            if(dept.getParentId() == null){
+//                dept.setParentId(number);
+//                dept.setAncestors("0");
+//            }
             dept.setStatus("0");
-        }
+//        }
         //备用编号
         String alternateNumber = IdUtils.fastSimpleUUID();
         dept.setAlternateNumber(alternateNumber);

tianhu-system/src/main/java/com/tianhu/system/controller/SysRoleController.java

@@ -60,9 +60,9 @@ public class SysRoleController extends BaseController
         String companyId = user.getCompanyId();
         role.setIsAuto("0");
         //判断是否为运维管理员 000000：代表运维管理员
-        if(!SalaryConstants.OPEX.equals(companyId)){
+//        if(!SalaryConstants.OPEX.equals(companyId)){
             role.setCompanyId(companyId);
-        }
+//        }
         List<SysRole> list = roleService.selectRoleList(role);
         return getDataTable(list);
     }
@@ -109,9 +109,9 @@ public class SysRoleController extends BaseController
         if(!SalaryConstants.OPEX.equals(user.getCompanyId())){
             role.setCompanyId(user.getCompanyId());
         }else {
-            if(role.getCompanyId() == null){
+//            if(role.getCompanyId() == null){
                 role.setCompanyId(user.getCompanyId());
-            }
+//            }
         }
         if (UserConstants.NOT_UNIQUE.equals(roleService.checkRoleNameUnique(role)))
         {

tianhu-system/src/main/java/com/tianhu/system/controller/SysUserController.java

@@ -432,10 +432,10 @@ public class SysUserController extends BaseController
         SysRole role = new SysRole();
         role.setIsAuto("0");
         Map map = new HashMap<>();
-        if(!SalaryConstants.OPEX.equals(companyId)){
+//        if(!SalaryConstants.OPEX.equals(companyId)){
             map.put("companyId",companyId);
             role.setCompanyId(companyId);
-        }
+//        }
         List<SysRole> roles = roleService.selectRoleAll(role);
         ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin() ).collect(Collectors.toList()));
         if (StringUtils.isNotNull(userId))
@@ -457,12 +457,13 @@ public class SysUserController extends BaseController
     public AjaxResult add(@Validated @RequestBody SysUser user) throws Exception {
         LoginUser userInfo = tokenService.getLoginUser();
         SysUser use = userInfo.getSysUser();
+        String companyId = use.getCompanyId();
         //000000：代表运维人员
         if(!SalaryConstants.OPEX.equals(use.getCompanyId())){
-            user.setCompanyId(use.getCompanyId());
+            user.setCompanyId(companyId);
         }else {
             if(user.getCompanyId() == null){
-                user.setCompanyId(use.getCompanyId());
+                user.setCompanyId(companyId);
             }
         }
 
@@ -470,21 +471,30 @@ public class SysUserController extends BaseController
             return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，请先选择角色");
         }
 
-        // 用户已存在
-        Map map = new HashMap();
-        map.put("userName", user.getUserName());
-        int count = userMapper.checkUserNameUnique(map);
-        // 用户不存在
-        if (count == 0) {
-            String password = configService.selectConfigByKey("sys.user.initPassword");
+        String password = configService.selectConfigByKey("sys.user.initPassword");
+
+        //查询用户是否存在
+        Map useMap = new HashMap();
+        useMap.put("userName",user.getUserName());
+        List<Map> listNormalUser = userService.selectNormalUser(useMap);
+        if(listNormalUser.size() > 0){
+           //获取用户Id
+           String userId = listNormalUser.get(0).get("userId")+"";
+           //查询此企业是否存在此用户
+           LambdaQueryWrapper<SysUserCompanyRel> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(SysUserCompanyRel::getSucrUserId,userId);
+            queryWrapper.eq(SysUserCompanyRel::getSucrCompanyId,companyId);
+            List<SysUserCompanyRel> list = userCompanyRelService.findSysUserCompanyRels(queryWrapper);
+            if(list.size() > 0){
+                return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，用户已存在");
+            }
+        } else{
             user.setStatus("0");
             user.setPassword(password);
             user.setCreateBy(SecurityUtils.getUsername());
             userMapper.insertUser(user);
-            Map passwordMap =new HashMap();
-            passwordMap.put("password",password);
-            messageUtilsService.sendMessageCode(user.getPhonenumber(),zhucechenggong,passwordMap,null);
         }
+
         SysUser queryUser = userService.selectUserByUserName(user.getUserName());
         Long[] roles = user.getRoleIds();
         if (StringUtils.isNotNull(roles))
@@ -506,11 +516,13 @@ public class SysUserController extends BaseController
 
         SysUserCompanyRel userCompanyRel = new SysUserCompanyRel();
         userCompanyRel.setSucrUserId(queryUser.getUserId());
-        userCompanyRel.setSucrCompanyId(use.getCompanyId());
+        userCompanyRel.setSucrCompanyId(companyId);
         userCompanyRel.setSucrHandler("0");
         userCompanyRel.setSucrDeptId(user.getDeptId());
         userCompanyRelService.createSysUserCompanyRel(userCompanyRel);
 
+
+
         // 审批表增加数据
         Map<String, Object> flowableRes = flowableService.addFlowableUser(String.valueOf(queryUser.getUserId()), user.getNickName(), use.getCompanyId());
         if (!"200".equals(flowableRes.get("code"))) {
@@ -522,12 +534,17 @@ public class SysUserController extends BaseController
             throw new Exception("审批数据新增失败!");
         }
         //获取企业信息
-        SysCompany sysCompany = sysCompanyService.getById(use.getCompanyId());
+//        SysCompany sysCompany = sysCompanyService.getById(companyId);
         //待办标题
-        String tittle = "【" +sysCompany.getScyName()+"】尊敬的用户，您好! 欢迎您来到招采云链医疗供应链金融平台，平台将提供：" +
-                "医疗招商、医疗集采、供应链金融等企业级服务，如果您再平台使用中遇到任何问题，" +
-                "请再首页查看并拨打平台客服专线电话，我们将竭尽所能为您提供免费的咨询服务";
-        remoteSystemService.sendNotice(use.getCompanyId(),use.getCompanyId(),tittle,"01","00",null,"0",String.valueOf(queryUser.getUserId()),null);
+//        String tittle = "【" +sysCompany.getScyName()+"】尊敬的用户，您好! 欢迎您来到招采云链医疗供应链金融平台，平台将提供：" +
+//                "医疗招商、医疗集采、供应链金融等企业级服务，如果您再平台使用中遇到任何问题，" +
+//                "请再首页查看并拨打平台客服专线电话，我们将竭尽所能为您提供免费的咨询服务";
+//        remoteSystemService.sendNotice(use.getCompanyId(),use.getCompanyId(),tittle,"01","00",null,"0",String.valueOf(queryUser.getUserId()),null);
+        if (listNormalUser.size() < 0) {
+            Map passwordMap =new HashMap();
+            passwordMap.put("password",password);
+            messageUtilsService.sendMessageCode(user.getPhonenumber(),zhucechenggong,passwordMap,null);
+        }
         return toAjax(1);
     }
 

tianhu-system/src/main/java/com/tianhu/system/mapper/SysDeptMapper.java

@@ -86,7 +86,7 @@ public interface SysDeptMapper
      * @param parentId 父部门ID
      * @return 结果
      */
-    public SysDept checkDeptNameUnique(@Param("deptName") String deptName, @Param("parentId") Long parentId);
+    public SysDept checkDeptNameUnique(@Param("deptName") String deptName, @Param("parentId") Long parentId, @Param("companyId") String companyId);
 
     /**
      * 新增部门信息

tianhu-system/src/main/java/com/tianhu/system/mapper/SysUserMapper.java

@@ -54,6 +54,14 @@ public interface SysUserMapper
     List<Map> selectUserByUserNamed(Map map);
 
     /**
+     * 查询是否有此用户
+     * @param map
+     * @return
+     */
+    public List<Map> selectNormalUser(Map map);
+
+
+    /**
      * 通过用户ID查询用户
      * 
      * @param userId 用户ID

tianhu-system/src/main/java/com/tianhu/system/service/ISysUserService.java

@@ -61,6 +61,14 @@ public interface ISysUserService
     public String selectUserRole(Map map);
 
     /**
+     * 查询有无此用户
+     *
+     * @param map 用户数据
+     * @return 结果
+     */
+    public List<Map> selectNormalUser(Map map);
+
+    /**
      * 校验用户名称是否唯一
      *
      * @param userName 用户名称

tianhu-system/src/main/java/com/tianhu/system/service/impl/SysDeptServiceImpl.java

@@ -191,7 +191,7 @@ public class SysDeptServiceImpl implements ISysDeptService
     public String checkDeptNameUnique(SysDept dept)
     {
         Long deptId = StringUtils.isNull(dept.getDeptId()) ? -1L : dept.getDeptId();
-        SysDept info = deptMapper.checkDeptNameUnique(dept.getDeptName(), dept.getParentId());
+        SysDept info = deptMapper.checkDeptNameUnique(dept.getDeptName(), dept.getParentId(), dept.getCompanyId());
         if (StringUtils.isNotNull(info) && info.getDeptId().longValue() != deptId.longValue())
         {
             return UserConstants.NOT_UNIQUE;

tianhu-system/src/main/java/com/tianhu/system/service/impl/SysUserServiceImpl.java

@@ -133,6 +133,13 @@ public class SysUserServiceImpl implements ISysUserService
         }
         return idsStr.toString();
     }
+
+    @Override
+    public List<Map> selectNormalUser(Map map)
+    {
+        return userMapper.selectNormalUser(map);
+    }
+
     /**
      * 查询用户所属角色组
      *

tianhu-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -94,7 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 
     <select id="checkDeptExistUser" parameterType="Long" resultType="int">
-		select count(1) from sys_user where dept_id = #{deptId} and del_flag = '0'
+		select count(1) from sys_user_company_rel where sucr_dept_id = #{deptId}
 	</select>
 
 	<select id="hasChildByDeptId" parameterType="Long" resultType="int">
@@ -114,6 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	    <include refid="selectDeptVo"/>
 		where dept_name=#{deptName}
 		and parent_id = #{parentId}
+		and company_id = #{companyId}
 		and del_flag = '0' limit 1
 	</select>
 

tianhu-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -87,6 +87,14 @@
 		and u.del_flag = '0'
 	</select>
 
+	<select id="selectNormalUser" parameterType="map" resultType="map">
+		select 	user_id		'userId',
+				user_name 	'userName'
+		from sys_user
+		where 	user_name = #{userName}
+				and del_flag = '0'
+	</select>
+
 	<select id="selectUserByUserNamed" parameterType="String" resultMap="SysUserResult">
 		<include refid="selectUserVo"/>
 		where u.user_name = #{userName} and u.phonenumber = #{phonenumber}