功能修改

hx-file/src/main/java/com/fjhx/file/service/impl/FileInfoServiceImpl.java

@@ -54,7 +54,7 @@ public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> i
     @Value("${obs.url}")
     private String url;
 
-    @Value("${obs.type}")
+    @Value("${obs.type:}")
     private String type;
 
     @Value("${obs.bucketName}")

hx-tenant/src/main/java/com/fjhx/tenant/controller/tenant/DetpTenantController.java

@@ -15,6 +15,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Objects;
 
 @TenantIgnore
 @DS(BaseSourceConstant.BASE)
@@ -60,7 +61,9 @@ public class DetpTenantController {
             throw new ServiceException("租户id不能为空");
         }
 
+        //公司0 1业务中心 部门2 组3
         Long deptId = dept.getDeptId();
+
         deptService.checkDeptDataScope(deptId);
         if (!deptService.checkDeptNameUnique(dept)) {
             throw new ServiceException("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在");

hx-tenant/src/main/java/com/fjhx/tenant/controller/tenant/UserTenantController.java

@@ -11,7 +11,6 @@ import com.ruoyi.common.annotation.TenantIgnore;
 import com.ruoyi.common.constant.BaseSourceConstant;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysRole;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -28,10 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -57,6 +53,13 @@ public class UserTenantController extends BaseController {
      */
     @GetMapping("/list")
     public TableDataInfo list(SysUser user) {
+
+        //权限过滤：用户列表-子公司看自己的,总公司看全部
+        Long companyId = SecurityUtils.getCompanyId();
+        if (!Objects.equals(companyId, 100L)) {
+            user.setCompanyId(companyId);
+        }
+
         startPage();
         List<SysUser> list = userService.selectUserList(user);
         return getDataTable(list);

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java

@@ -107,6 +107,11 @@ public class SysDept extends BaseEntity {
     @TableField(exist = false)
     private List<SysDept> children = new ArrayList<SysDept>();
 
+    /**
+     * 性质
+     */
+    private Integer nature;
+
     public Long getDeptId() {
         return deptId;
     }
@@ -249,6 +254,14 @@ public class SysDept extends BaseEntity {
         this.jstDistributor = jstDistributor;
     }
 
+    public Integer getNature() {
+        return nature;
+    }
+
+    public void setNature(Integer nature) {
+        this.nature = nature;
+    }
+
     @Override
     public String toString() {
         return "SysDept{" +

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -193,6 +193,8 @@ public class SysUser extends BaseEntity {
     @TableField(exist = false)
     List<String> deptNameList;
 
+    private String companySet;
+
     public List<String> getDeptNameList() {
         return deptNameList;
     }
@@ -445,6 +447,14 @@ public class SysUser extends BaseEntity {
         this.sysRoleList = sysRoleList;
     }
 
+    public String getCompanySet() {
+        return companySet;
+    }
+
+    public void setCompanySet(String companySet) {
+        this.companySet = companySet;
+    }
+
     @Override
     public String toString() {
         return "SysUser{" +

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

@@ -133,7 +133,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
 
     List<SysUser> getListByPostId(@Param("postId")Long postId, @Param("companyId") Long companyId);
 
-    List<SysUser> getListByRoleIds(@Param("roleId")List<Long> roleIds, @Param("companyId") Long companyId);
+    List<SysUser> getListByRoleIds(@Param("roleIds")List<Long> roleIds, @Param("companyId") Long companyId);
 
     List<SysRole> getRoleByUserIdList(@Param("userIdList") List<Long> userIdList);
 

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

@@ -42,7 +42,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			   d.create_time,
 			   d.tenant_id,
 			   d.type,
-			   d.jst_distributor
+			   d.jst_distributor,
+			   d.nature
 		from sys_dept d
 	</sql>
     
@@ -136,6 +137,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="status != null">status,</if>
 		<if test="tenantId != null and tenantId != ''">tenant_id,</if>
         <if test="createBy != null and createBy != ''">create_by,</if>
+		<if test="nature != null">nature,</if>
         create_time,
 		jst_distributor
 		)values(
@@ -152,7 +154,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="status != null">#{status},</if>
 		<if test="tenantId != null and tenantId != ''">#{tenantId},</if>
         <if test="createBy != null and createBy != ''">#{createBy},</if>
-        sysdate(),
+		<if test="nature != null">#{nature},</if>
+		sysdate(),
 		#{jstDistributor}
         )
     </insert>
@@ -171,7 +174,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="email != null">email = #{email},</if>
  			<if test="status != null and status != ''">status = #{status},</if>
 			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- 			update_time = sysdate(),
+			<if test="nature != null">#{nature},</if>
+			update_time = sysdate(),
 			jst_distributor = #{jstDistributor}
 		</set>
  		where dept_id = #{deptId}

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

@@ -29,6 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="userCode" column="user_code"/>
 		<result property="userType"     column="user_type"	  />
 		<result property="companyId"     column="company_id"	  />
+		<result property="companySet"     column="company_set"	  />
 		<association property="dept"    column="dept_id" javaType="SysDept" resultMap="deptResult" />
         <collection  property="roles"   javaType="java.util.List"           resultMap="RoleResult" />
 	</resultMap>
@@ -75,6 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			   u.tenant_id,
 			   u.user_code,
 			   u.company_id,
+			   u.company_set,
 			   d.dept_id,
 			   d.parent_id,
 			   d.ancestors,
@@ -100,7 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		select
 		u.user_id, u.dept_id, u.nick_name, u.nick_name_en, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status,
 		u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader_id,
-		d.director_id, d.type,u.job_number,u.user_type,u.tenant_id,u.user_code,u.company_id
+		d.director_id, d.type,u.job_number,u.user_type,u.tenant_id,u.user_code,u.company_id,u.company_set
 		from
 		sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
@@ -325,7 +327,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="userCode != null and userCode != ''">user_code,</if>
 		<if test="nickNameEn != null and nickNameEn != ''">nick_name_en,</if>
 		<if test="companyId != null and companyId != ''">company_id,</if>
-		create_time
+        <if test="companySet != null and companySet != ''">company_set,</if>
+        create_time
         )values(
         <if test="userId != null and userId != ''">#{userId},</if>
         <if test="deptId != null and deptId != ''">#{deptId},</if>
@@ -345,6 +348,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="userCode != null and userCode != ''">#{userCode},</if>
 		<if test="nickNameEn != null and nickNameEn != ''">#{nickNameEn},</if>
 		<if test="companyId != null and companyId != ''">#{companyId},</if>
+		<if test="companySet != null and companySet != ''">#{companySet},</if>
 		sysdate()
         )
     </insert>
@@ -372,6 +376,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="userCode != null and userCode != ''">user_code = #{userCode},</if>
 			<if test="nickNameEn != null and nickNameEn != ''">nick_name_en = #{nickNameEn},</if>
 			<if test="companyId != null and companyId != ''">company_id = #{companyId},</if>
+			<if test="companySet != null and companySet != ''">company_set = #{companySet},</if>
 			update_time = sysdate()
         </set>
         where user_id = #{userId}