配置文件修改

PCS/src/main/java/cn/cslg/permission/common/model/vo/EntrustVO.java

@@ -0,0 +1,36 @@
+package cn.cslg.permission.common.model.vo;
+
+import cn.cslg.permission.common.model.BaseVO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @author 李仁杰
+ * @date 2023-11-12
+ * @description
+ */
+
+@Data
+@Accessors(chain = true)
+public class EntrustVO  {
+    /**
+     * Front:
+     * Back:ID
+     */
+    private String entrustId;
+
+    /**
+     * Front:
+     * Back:数据权限名称
+     */
+    private String name;
+
+    /**
+     * Front:
+     * Back:数据权限描述
+     */
+    private Integer entrustType;
+
+
+}

PCS/src/main/java/cn/cslg/permission/controller/SystemController.java

@@ -3,6 +3,8 @@ package cn.cslg.permission.controller;
 import cn.cslg.permission.common.config.MailConstants;
 import cn.cslg.permission.common.core.base.Constants;
 import cn.cslg.permission.common.model.dto.PasUserDTO;
+import cn.cslg.permission.common.model.vo.DepartmentVO;
+import cn.cslg.permission.common.model.vo.EntrustVO;
 import cn.cslg.permission.common.model.vo.PasUserVO;
 import cn.cslg.permission.common.model.vo.PersonnelVO;
 import cn.cslg.permission.common.utils.Response;
@@ -131,7 +133,7 @@ public class SystemController {
 
     @PostMapping("/getDeparts")
     @Operation(summary = "根据部门id获得名称")
-    public List<Map<String, Object>> getDeparts(@RequestBody List<Integer> departIds) {
+    public List<Map<String, Object>> getDeparts(@RequestBody List<String> departIds) {
         return systemService.getDeparts(departIds);
     }
 
@@ -194,4 +196,33 @@ public class SystemController {
     public List<Integer> getClientIdByName(String clientName, Boolean ifEqual) {
         return systemService.getClientIdByName(clientName, ifEqual);
     }
+
+    @GetMapping("/getDepartmentOrders")
+    @Operation(summary = "查找部门排序")
+    public List<String> getDepartmentOrders(Integer orderType) {
+        return systemService.getDepartmentOrders(orderType);
+    }
+
+
+    @GetMapping("/getEntrustsOrder")
+    @Operation(summary = "查询委托方排序")
+    public List<EntrustVO> getEntrustsOrder(Integer orderType) {
+        return systemService.getEntrustsOrder(orderType);
+    }
+    @PostMapping("/getEntrustsByIdAndType")
+    @Operation(summary = "根据id和类型获得名称")
+    public List<EntrustVO> getEntrustsByIdAndType(@RequestBody List<EntrustVO> entrustVOS) {
+        return systemService.getEntrustsByIdAndType(entrustVOS);
+    }
+    @GetMapping("/getEntrustsByName")
+    @Operation(summary = "根据名称获得id和类型")
+    public List<EntrustVO> getEntrustsByName(String name,Integer type) {
+        return systemService.getEntrustsByName(name,type);
+    }
+
+    @GetMapping("/getDepartmentIdByName")
+    @Operation(summary = "根据部门名称查询部门")
+    public List<Integer> getDepartmentIdByName(String departmentName, Boolean ifEqual) {
+        return systemService.getDepartmentIdByName(departmentName,ifEqual);
+    }
 }

PCS/src/main/java/cn/cslg/permission/mapper/DepartmentMapper.java

@@ -1,5 +1,6 @@
 package cn.cslg.permission.mapper;
 
+import cn.cslg.permission.common.model.vo.EntrustVO;
 import cn.cslg.permission.domain.Department;
 import cn.cslg.permission.domain.Function;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -20,4 +21,7 @@ public interface DepartmentMapper extends BaseMapper<Department> {
     @Select("SELECT * FROM DEPARTMENT WHERE IS_DELETE = 0 AND FIND_IN_SET(#{param},PATH)")
     List<Department> getDepartInPathById(@Param("param") Object param);
    List<Integer>  getChildIds(@Param("ids") List<Integer> ids);
+   List<EntrustVO> getEntrustsOrder(@Param("orderType") Integer orderType);
+    List<EntrustVO> getEntrustsByIdAndType(@Param("entrustVOS") List<EntrustVO> entrustVOS);
+    List<EntrustVO> getEntrustsByName (@Param("name") String name,@Param("type") Integer type);
 }

PCS/src/main/java/cn/cslg/permission/service/PersonnelService.java

@@ -327,6 +327,11 @@ public class PersonnelService extends ServiceImpl<PersonnelMapper, Personnel> {
                         .like(Personnel::getPersonnelDescription, personnelVO.getName())
                 );
 
+        //根据人员id查询
+        if(personnelVO.getId()!=null){
+            queryWrapper.in(Personnel::getId, Integer.parseInt(personnelVO.getId()));
+        }
+
         //若前台有传部门ids，则根据部门ids查询人员列表
         if (personnelVO.getDepartmentIds() != null && personnelVO.getDepartmentIds().size() != 0) {
             LambdaQueryWrapper<AssoDepartPos> qw = new LambdaQueryWrapper<>();

PCS/src/main/java/cn/cslg/permission/service/SystemService.java

@@ -1,6 +1,7 @@
 package cn.cslg.permission.service;
 
 import cn.cslg.permission.common.model.dto.PasUserDTO;
+import cn.cslg.permission.common.model.vo.EntrustVO;
 import cn.cslg.permission.common.model.vo.PasUserVO;
 import cn.cslg.permission.common.model.vo.PersonnelVO;
 import cn.cslg.permission.common.utils.CacheUtils;
@@ -45,6 +46,7 @@ public class SystemService {
     private final ApplicationService applicationService;
     private final TenantService tenantService;
     private final ClientService clientService;
+
     /**
      * 获取用户信息
      *
@@ -209,13 +211,12 @@ public class SystemService {
      * @title 根据id查询人员
      * @description 获取所有的人员 不分租户
      */
-    public List<String> getPersonIdByName(String personName,Boolean ifEqual) {
+    public List<String> getPersonIdByName(String personName, Boolean ifEqual) {
         LambdaQueryWrapper<Personnel> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.select(Personnel::getId);
-        if(ifEqual!=null&&ifEqual.equals(true)) {
+        if (ifEqual != null && ifEqual.equals(true)) {
             queryWrapper.like(Personnel::getPersonnelName, personName);
-        }
-        else {
+        } else {
             queryWrapper.eq(Personnel::getPersonnelName, personName);
         }
         java.util.function.Function<Object, String> f = (o -> o.toString());
@@ -273,9 +274,14 @@ public class SystemService {
      * @title 根据id查询部门
      * @description 获取所有的部门
      */
-    public List<Map<String, Object>> getDeparts(List<Integer> departIds) {
+    public List<Map<String, Object>> getDeparts(List<String> departIds) {
+        List<Integer> ids = new ArrayList<>();
+        departIds.forEach(item -> {
+            Integer id = Integer.parseInt(item);
+            ids.add(id);
+        });
         LambdaQueryWrapper<Department> queryWrapper1 = new LambdaQueryWrapper<>();
-        queryWrapper1.in(Department::getId, departIds);
+        queryWrapper1.in(Department::getId,ids);
         List<Map<String, Object>> mapList = new ArrayList<>();
         List<Department> departmentList = departmentService.list(queryWrapper1);
         departmentList.forEach(item -> {
@@ -328,25 +334,26 @@ public class SystemService {
 
     /**
      * 获得人员排序
+     *
      * @param orderType
      * @return
      */
     public List<String> getPersonIdOrders(Integer orderType) {
         LambdaQueryWrapper<Personnel> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.select(Personnel::getId);
-        if(orderType.equals(0)){
+        if (orderType.equals(0)) {
             queryWrapper.orderByAsc(Personnel::getPersonnelName);
-        }
-        else{
+        } else {
             queryWrapper.orderByDesc(Personnel::getPersonnelName);
         }
-        java.util.function.Function<Object, String> f = (o ->o.toString());
+        java.util.function.Function<Object, String> f = (o -> o.toString());
         List<String> ids = personnelService.listObjs(queryWrapper, f);
         return ids;
     }
 
     /**
      * 根据id获取客户
+     *
      * @param ids
      * @return
      */
@@ -362,16 +369,16 @@ public class SystemService {
 
     /**
      * 获得客户排序
+     *
      * @param orderType
      * @return
      */
     public List<Integer> getClientIdOrders(Integer orderType) {
         LambdaQueryWrapper<Client> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.select(Client::getId);
-        if(orderType.equals(0)){
+        if (orderType.equals(0)) {
             queryWrapper.orderByAsc(Client::getName);
-        }
-        else{
+        } else {
             queryWrapper.orderByDesc(Client::getName);
         }
         java.util.function.Function<Object, Integer> f = (o -> Integer.parseInt(o.toString()));
@@ -385,17 +392,90 @@ public class SystemService {
      * @title 根据客户名称获得客户id
      * @description 获取所有的人员 不分租户
      */
-    public List<Integer> getClientIdByName(String clientName,Boolean ifEqual) {
+    public List<Integer> getClientIdByName(String clientName, Boolean ifEqual) {
         LambdaQueryWrapper<Client> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.select(Client::getId);
-        if(ifEqual!=null&&ifEqual.equals(true)) {
+        if (ifEqual != null && ifEqual.equals(true)) {
             queryWrapper.like(Client::getName, clientName);
-        }
-        else {
+        } else {
             queryWrapper.eq(Client::getName, clientName);
         }
         java.util.function.Function<Object, Integer> f = (o -> Integer.parseInt(o.toString()));
         List<Integer> ids = clientService.listObjs(queryWrapper, f);
         return ids;
     }
+
+
+
+    /**
+     * 获得部门排序
+     *
+     * @param orderType
+     * @return
+     */
+    public List<String> getDepartmentOrders(Integer orderType) {
+        LambdaQueryWrapper<Department> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.select(Department::getId);
+        if (orderType.equals(0)) {
+            queryWrapper.orderByAsc(Department::getDepartmentName);
+        } else {
+            queryWrapper.orderByDesc(Department::getDepartmentName);
+        }
+        java.util.function.Function<Object, String> f = (o -> o.toString());
+        List<String> ids = departmentService.listObjs(queryWrapper, f);
+        return ids;
+    }
+
+
+    /**
+     * 获得委托方 排序
+     *
+     * @param orderType
+     * @return
+     */
+    public List<EntrustVO> getEntrustsOrder(Integer orderType) {
+     List<EntrustVO>  entrustVOS=  departmentService.getBaseMapper().getEntrustsOrder(orderType);
+        return entrustVOS;
+    }
+
+    /**
+     * 根据id和类型获得名称
+     *
+     * @param
+     * @return
+     */
+    public List<EntrustVO> getEntrustsByIdAndType(List<EntrustVO> entrustVOS) {
+        List<EntrustVO>  entrustVOList=  departmentService.getBaseMapper().getEntrustsByIdAndType(entrustVOS);
+        return entrustVOList;
+    }
+
+    /**
+     * 根据名称获得委托方类型和id
+     *
+     * @param
+     * @return
+     */
+    public List<EntrustVO> getEntrustsByName(String name,Integer type) {
+        List<EntrustVO>  entrustVOList=  departmentService.getBaseMapper().getEntrustsByName(name,type);
+        return entrustVOList;
+    }
+
+    /**
+     * @author 李仁杰
+     * @title 根据客户名称获得客户id
+     * @description 获取所有的人员 不分租户
+     */
+    public List<Integer> getDepartmentIdByName(String departmentName, Boolean ifEqual) {
+        LambdaQueryWrapper<Department> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.select(Department::getId);
+        if (ifEqual != null && ifEqual.equals(true)) {
+            queryWrapper.like(Department::getDepartmentName, departmentName);
+        } else {
+            queryWrapper.eq(Department::getDepartmentName, departmentName);
+        }
+        java.util.function.Function<Object, Integer> f = (o -> Integer.parseInt(o.toString()));
+        List<Integer> ids = departmentService.listObjs(queryWrapper, f);
+        return ids;
+    }
+
 }

PCS/src/main/java/cn/cslg/permission/service/associate/RoleFunctionDataService.java

@@ -366,8 +366,7 @@ public class RoleFunctionDataService extends ServiceImpl<AssoRoleFunctionDataMap
             DataVO dataVO = new DataVO();
             for (Data data : dataList) {
                 if (function.getId().equals(data.getFunctionId())) {
-                    dataVO
-                            .setRule(data.getDataRule())
+                    dataVO.setRule(data.getDataRule())
                             .setId(data.getId())
                             .setName(data.getDataName())
                             .setRemark(data.getDataDescription());

PCS/src/main/resources/mapper/DepartmentMapper.xml

@@ -1,13 +1,67 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="cn.cslg.permission.mapper.DepartmentMapper">
-  <select id="getChildIds" resultType="java.lang.Integer">
- select Id from DEPARTMENT
-<where>
-  <foreach collection="ids" item="item" separator=" or " open="(" close=")">
-   FIND_IN_SET(#{item},PATH)
-  </foreach>
-</where>
-  </select>
+    <select id="getChildIds" resultType="java.lang.Integer">
+        select Id from DEPARTMENT
+        <where>
+            <foreach collection="ids" item="item" separator=" or " open="(" close=")">
+                FIND_IN_SET(#{item},PATH)
+            </foreach>
+        </where>
+    </select>
+
+    <select id="getEntrustsOrder" resultType="cn.cslg.permission.common.model.vo.EntrustVO">
+        select *
+        from (select id as entrustId, NAME as name, 1 as entrustType
+        from CLIENT
+        union all
+        select id as entrustId, DEPARTMENT_NAME as name, 2 as entrustType
+        from PCS_TEST.DEPARTMENT) as c
+        order by name
+        <if test="orderType==0">
+            asc
+        </if>
+        <if test="orderType!=0">
+            desc
+        </if>
+    </select>
+
+    <select id="getEntrustsByIdAndType" resultType="cn.cslg.permission.common.model.vo.EntrustVO">
+        select *
+        from (select id as entrustId, NAME as name, 1 as entrustType
+        from CLIENT
+        union all
+        select id as entrustId, DEPARTMENT_NAME as name, 2 as entrustType
+        from PCS_TEST.DEPARTMENT) as c
+        where
+        <foreach collection="entrustVOS" index="index" item="item" open="(" separator="," close=")">
+          c.entrustId =  #{item.entrustId}  and c.entrustType =#{item.entrustType}
+        </foreach>
+    </select>
+
+    <select id="getEntrustsByName" resultType="cn.cslg.permission.common.model.vo.EntrustVO">
+        select *
+        from (select id as entrustId, NAME as name, 1 as entrustType
+        from CLIENT
+        where
+        <if test="type ==0">
+            name=#{name}
+        </if>
+        <if test="type ==1">
+            name   like  concat('%', #{name}, '%')
+        </if>
+        union all
+        select id as entrustId, DEPARTMENT_NAME as name, 2 as entrustType
+        from PCS_TEST.DEPARTMENT
+        where
+        <if test="type ==0">
+            DEPARTMENT_NAME=#{name}
+        </if>
+        <if test="type ==1">
+            DEPARTMENT_NAME   like  concat('%', #{name}, '%')
+        </if>  ) as c
+
+    </select>
+
 
 </mapper>