企业权限配置和权限角色修改

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

@@ -13,11 +13,7 @@ import com.tianhu.common.security.service.TokenService;
 import com.tianhu.system.api.RemoteFileService;
 import com.tianhu.system.api.domain.*;
 import com.tianhu.system.api.model.LoginUser;
-import com.tianhu.system.domain.FileInf;
-import com.tianhu.system.domain.SysCompany;
-import com.tianhu.system.domain.SysManagementFileRel;
-import com.tianhu.system.domain.SysManagementInf;
-import com.tianhu.system.domain.SysUserCompanyRel;
+import com.tianhu.system.domain.*;
 import com.tianhu.system.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
@@ -62,6 +58,8 @@ public class OwnManagementInfController extends BaseController
     //删除文件的公共方法服务类
     @Autowired
     private RemoteFileService remoteFileService;
+    @Autowired
+    private ISysCompanyProductService sysCompanyProductService;
     /**
      * 公司状态(正常)
      */
@@ -290,6 +288,7 @@ public class OwnManagementInfController extends BaseController
         sysManagementInf.setSmiContractId(listUserTwo.getUserId());
         sysManagementInf.setSmiDesc(smiDesc);
         sysManagementInfService.createSysManagementInf(sysManagementInf);
+        // 企业用户关系表
         SysUserCompanyRel sysUserCompanyRel =new SysUserCompanyRel();
         sysUserCompanyRel.setSucrCompanyId(scyId);
         sysUserCompanyRel.setSucrUserId(listUserTwo.getUserId());
@@ -302,6 +301,18 @@ public class OwnManagementInfController extends BaseController
             file.setSmfrFileId(smiAgreement.get(i).get("uid"));
             sysManagementFileRelService.createSysManagementFileRel(file);
         }
+        // 资方权限配置
+        String sysCompanyProductId = IdUtils.fastSimpleUUID();
+        SysCompanyProduct sysCompanyProduct = new SysCompanyProduct();
+        String managementProductId = configService.selectConfigByKey("system.company.management");
+        sysCompanyProduct.setScpProducId(managementProductId);
+        sysCompanyProduct.setScpCompanyId(scyId);
+        sysCompanyProduct.setScpId(sysCompanyProductId);
+        sysCompanyProduct.setScpStartDate("20210101");
+        sysCompanyProduct.setScpEndDate("20990101");
+        sysCompanyProduct.setScpState("00");
+        sysCompanyProductService.insertSysCompanyProduct(sysCompanyProduct);
+
         return R.ok();
     }
 

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

@@ -419,7 +419,7 @@ public class SysUserController extends BaseController
         ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin() ).collect(Collectors.toList()));
         if (StringUtils.isNotNull(userId))
         {
-            ajax.put(AjaxResult.DATA_TAG, userService.selectUserById(userId));
+            ajax.put(AjaxResult.DATA_TAG, userService.selectUserById(userId, companyId));
             ajax.put("roleIds", roleService.selectRoleListByUserId(userId));
 
         }

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

@@ -151,4 +151,5 @@ public interface SysUserMapper
      */
     public SysUser checkEmailUnique(Map map);
 
+    public Map<String, Object> selectUserInfoByCompany(Map map);
 }

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

@@ -37,6 +37,14 @@ public interface ISysUserService
     public SysUser selectUserById(Long userId);
 
     /**
+     * 通过用户ID和公司id查询用户
+     *
+     * @param userId 用户ID
+     * @return 用户对象信息
+     */
+    public Map<String, Object> selectUserById(Long userId, String companyId);
+
+    /**
      * 根据用户ID查询用户所属角色组
      *
      * @param userName 用户名

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

@@ -100,6 +100,14 @@ public class SysUserServiceImpl implements ISysUserService
         return userMapper.selectUserById(userId);
     }
 
+    @Override
+    public Map<String, Object> selectUserById(Long userId, String companyId){
+        Map<String, Object> param = new HashMap<>();
+        param.put("userId", userId);
+        param.put("companyId", companyId);
+        return userMapper.selectUserInfoByCompany(param);
+    }
+
     /**
      * 查询用户所属角色组
      *

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

@@ -69,6 +69,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			</if>
 			)
 		WHERE u.del_flag = '0'
+		<if test="companyId != '000000'">
+			and ucr.sucr_company_id = #{companyId}
+		</if>
 		<if test="userName != null and userName != ''">
 			AND u.user_name like concat('%', #{userName}, '%')
 		</if>

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

@@ -97,6 +97,35 @@
 		<include refid="selectUserVo"/>
 		where u.user_id = #{userId}
 	</select>
+	<select id="selectUserInfoByCompany" parameterType="map" resultType="java.util.Map">
+		select
+			u.user_id userId,
+			u.user_name userName,
+			u.nick_name nickName,
+			u.email email,
+			u.avatar avatar,
+			u.password status,
+			u.sex sex,
+			u.status status,
+			u.del_flag delFlag,
+			u.login_ip loginIp,
+			u.id_card idCard,
+			u.id_card_file idCardFile,
+			u.login_date loginDate,
+			u.create_by createBy,
+			u.create_time createTime,
+			u.remark,
+			d.dept_id deptId,
+			d.parent_id parentId,
+			d.dept_name deptName,
+			d.order_num orderNum,
+			d.leader leader,
+			d.status status
+		from sys_user u
+		LEFT JOIN sys_user_company_rel ucr on (ucr.sucr_company_id = #{companyId} and ucr.sucr_user_id = u.user_id)
+		LEFT JOIN sys_dept d on d.dept_id = ucr.sucr_dept_id
+		where u.user_id = #{userId}
+	</select>
 
 	<select id="checkUserNameUnique" parameterType="map" resultType="int">
 		select count(1) from sys_user where user_name = #{userName} and del_flag = '0'
@@ -107,7 +136,7 @@
 	</select>
 
 	<select id="checkPhoneUnique" parameterType="map"  resultMap="SysUserResult">
-		select user_id, phonenumber from sys_user where phonenumber = #{phonenumber} and company_id = #{companyId} and del_flag = '0' limit 1
+		select user_id, user_name from sys_user where user_name = #{phonenumber} and del_flag = '0' limit 1
 	</select>
 
 	<select id="checkEmailUnique" parameterType="map" resultMap="SysUserResult">