4/21的代码 权要主次类型修改过来

PAS/src/main/java/cn/cslg/pas/common/model/dto/AssoStructurePatentUpdateDTO.java

@@ -33,7 +33,7 @@ public class AssoStructurePatentUpdateDTO implements Serializable {
      */
     private Integer projectId;
     /**
-     * 更新类型(1新增 0删除)
+     * 更新类型(true新增 false删除)
      */
     private Boolean updateType;
 

PAS/src/main/java/cn/cslg/pas/domain/Structure.java

@@ -43,6 +43,10 @@ public class Structure implements Serializable {
      */
     private Integer productId;
     /**
+     * 租户id
+     */
+    private Integer tenantId;
+    /**
      * 创建人id
      */
     private Integer createPersonId;

PAS/src/main/java/cn/cslg/pas/mapper/StructureMapper.java

@@ -53,9 +53,10 @@ public interface StructureMapper extends BaseMapper<Structure> {
      * @param parentId      父级id
      * @param structureName 架构名称
      * @param structureId   架构id
+     * @param tenantId      租户id
      * @return 返回统计到的数量
      */
-    int countByparentIdAndStructureName(Integer parentId, String structureName, Integer structureId);
+    int countByparentIdAndStructureName(Integer parentId, String structureName, Integer structureId, Integer tenantId);
 
     /**
      * 根据id查询数据
@@ -78,9 +79,11 @@ public interface StructureMapper extends BaseMapper<Structure> {
      *
      * @param parentId  父级id
      * @param productId 产品id
+     * @param ids       架构ids(此为根据名称模糊查询架构树单一分支)
+     * @param tenantId  租户id
      * @return 返回查询到的数据
      */
-    List<StructureVO> selectByParentIdAndProductId(Integer parentId, Integer productId, List<Integer> ids);
+    List<StructureVO> selectByParentIdAndProductId(Integer parentId, Integer productId, List<Integer> ids, Integer tenantId);
 
     /**
      * 根据模糊路径查询数据
@@ -94,16 +97,18 @@ public interface StructureMapper extends BaseMapper<Structure> {
      * 根据产品id查询数据
      *
      * @param productId 产品id
+     * @param tenantId  租户id
      * @return 返回查询到的数据
      */
-    List<StructureVO> selectAllByProductId(Integer productId);
+    List<StructureVO> selectAllByProductId(Integer productId, Integer tenantId);
 
     /**
      * 根据架构id查询数据
      *
      * @param structureId 架构id
+     * @param tenantId    租户id
      * @return 返回查询到的数据
      */
-    List<StructureVO> selectAllByStructureId(Integer structureId);
+    List<StructureVO> selectAllByStructureId(Integer structureId, Integer tenantId);
 
 }

PAS/src/main/java/cn/cslg/pas/service/PatentRightService.java

@@ -574,7 +574,7 @@ public class PatentRightService extends ServiceImpl<PatentRightMapper, PatentRig
                             }
                             PatentRight patentRight = new PatentRight()
                                     .setPatentId(params.getPatentId())
-                                    .setType(1)
+                                    .setType(0)
                                     .setContent(strs[i])
                                     .setSort(i)
                                     .setParentSort(builder + "");
@@ -586,7 +586,7 @@ public class PatentRightService extends ServiceImpl<PatentRightMapper, PatentRig
                             String parentNum = matcher1.group().substring(matcher1.group().indexOf("求") + 1);
                             PatentRight patentRight = new PatentRight()
                                     .setPatentId(params.getPatentId())
-                                    .setType(1)
+                                    .setType(0)
                                     .setContent(strs[i])
                                     .setSort(i)
                                     .setParentSort((Integer.parseInt(parentNum) - 1) + "");
@@ -599,7 +599,7 @@ public class PatentRightService extends ServiceImpl<PatentRightMapper, PatentRig
                     } else {
                         PatentRight patentRight = new PatentRight()
                                 .setPatentId(params.getPatentId())
-                                .setType(0)
+                                .setType(1)
                                 .setContent(strs[i])
                                 .setSort(i)
                                 .setParentSort("-1");
@@ -675,7 +675,7 @@ public class PatentRightService extends ServiceImpl<PatentRightMapper, PatentRig
                             }
                             PatentRight patentRight = new PatentRight()
                                     .setPatentId(params.getPatentId())
-                                    .setType(1)
+                                    .setType(0)
                                     .setContent(strs[i])
                                     .setSort(i)
                                     .setParentSort(builder + "");
@@ -687,7 +687,7 @@ public class PatentRightService extends ServiceImpl<PatentRightMapper, PatentRig
                             String parentNum = matcher1.group().substring(matcher1.group().indexOf("m") + 2);
                             PatentRight patentRight = new PatentRight()
                                     .setPatentId(params.getPatentId())
-                                    .setType(1)
+                                    .setType(0)
                                     .setContent(strs[i])
                                     .setSort(i)
                                     .setParentSort((Integer.parseInt(parentNum) - 1) + "");
@@ -700,7 +700,7 @@ public class PatentRightService extends ServiceImpl<PatentRightMapper, PatentRig
                     } else {
                         PatentRight patentRight = new PatentRight()
                                 .setPatentId(params.getPatentId())
-                                .setType(0)
+                                .setType(1)
                                 .setContent(strs[i])
                                 .setSort(i)
                                 .setParentSort("-1");

PAS/src/main/java/cn/cslg/pas/service/impl/StructureServiceImpl.java

@@ -60,11 +60,16 @@ public class StructureServiceImpl extends ServiceImpl<StructureMapper, Structure
     public void addNew(StructureAddNewDTO structureAddNewDTO, List<MultipartFile> files) {
         log.info("开始处理【新增架构】的业务，参数为：{}, {}", structureAddNewDTO, files);
 
+        PersonnelVO personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
+        Integer createPersonId = personnelVO.getId();
+        String createPersonName = personnelVO.getName();
+        Integer tenantId = personnelVO.getTenantId();
+
         Integer parentId = structureAddNewDTO.getParentId();
         String structureName = structureAddNewDTO.getStructureName();
         //检查名称是否被占用(检查当前架构父级下是否有同名架构)
         log.info("检查名称是否被占用(检查当前父级下是否有同名架构)");
-        int count = structureMapper.countByparentIdAndStructureName(parentId, structureName, null);
+        int count = structureMapper.countByparentIdAndStructureName(parentId, structureName, null, tenantId);
         if (count > 0) {
             String message = "新增架构失败，当前父级下已存在【" + structureName + "】，请尝试更换名称";
             log.info("{}", message);
@@ -75,10 +80,10 @@ public class StructureServiceImpl extends ServiceImpl<StructureMapper, Structure
         Structure structure = new Structure();
         BeanUtils.copyProperties(structureAddNewDTO, structure);
 
-        PersonnelVO personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
         structure
-                .setCreatePersonId(personnelVO.getId())
-                .setCreatePersonName(personnelVO.getName());
+                .setCreatePersonId(createPersonId)
+                .setCreatePersonName(createPersonName)
+                .setTenantId(tenantId);
 
         //数据入架构表(此时数据暂不含路径path)
         log.info("数据入架构表");
@@ -141,6 +146,9 @@ public class StructureServiceImpl extends ServiceImpl<StructureMapper, Structure
     public void update(StructureUpdateDTO structureUpdateDTO, List<MultipartFile> files) {
         log.info("开始处理【修改架构】的业务，参数为：{}, {}", structureUpdateDTO, files);
 
+        PersonnelVO personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
+        Integer tenantId = personnelVO.getTenantId();
+
         //检查尝试修改的数据是否存在
         Integer structureId = structureUpdateDTO.getId();
         log.info("检查尝试修改的数据是否存在");
@@ -151,19 +159,18 @@ public class StructureServiceImpl extends ServiceImpl<StructureMapper, Structure
             throw new XiaoShiException(message);
         }
 
-        //获取该架构原父级id和原路径
+        //获取该架构原名称、父级id和原路径
         Integer oldParentId = queryResult.getParentId();
         String oldPath = queryResult.getPath();
-        //获取DTO中该架构当前父级id和父路径
+        //获取DTO中架构现名称、父级id和父路径
         Integer newParentId = structureUpdateDTO.getParentId();
-        String parentPath = structureUpdateDTO.getParentPath();
-        String newPath = parentPath + "," + structureId;
+        String newPath = structureUpdateDTO.getParentPath() + "," + structureId;
         //获取DTO中该架构当前名称
         String newStructureName = structureUpdateDTO.getStructureName();
 
         //检查名称是否被占用(检查当前尝试修改的架构父级下是否有同名架构)
-        log.info("检查名称是否被占用(检查当前尝试修改的架构父级下是否有同名架构)");
-        int count = structureMapper.countByparentIdAndStructureName(newParentId, newStructureName, structureId);
+        log.info("检查名称是否被占用(检查当前尝试修改的架构的新父级下是否有同名架构)");
+        int count = structureMapper.countByparentIdAndStructureName(newParentId, newStructureName, structureId, tenantId);
         if (count > 0) {
             String message = "修改架构失败，当前尝试修改的架构父级下已存在【" + newStructureName + "】，请尝试更换名称";
             log.info("{}", message);
@@ -275,6 +282,10 @@ public class StructureServiceImpl extends ServiceImpl<StructureMapper, Structure
     @Override
     public StructureVO query(StructureQueryPageDTO structureQueryPageDTO) {
         log.info("开始处理【查询架构树】的业务，参数为：{}", structureQueryPageDTO);
+
+        PersonnelVO personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
+        Integer tenantId = personnelVO.getTenantId();
+
         //从DTO中取出产品id、架构id
         Integer productId = structureQueryPageDTO.getProductId();
         Integer structureId = structureQueryPageDTO.getStructureId();
@@ -289,7 +300,7 @@ public class StructureServiceImpl extends ServiceImpl<StructureMapper, Structure
         }
 
         //以下代码表示查询所有架构的路径和路径拼接成的架构名称并封装成map集合，从map集合中取值为后面给每一个架构的pathName中文路径赋值
-        HashMap<String, String> map = getStructureIdAndStructureNameMap(productId);
+        HashMap<String, String> map = getStructureIdAndStructureNameMap(productId, tenantId);
 
         //以下代码表示若架构名称structureName有值则要根据架构名称模糊查询树，若架构名称structureName为null则表示查询了所有架构(不受影响)
         LambdaQueryWrapper<Structure> wrapper = new LambdaQueryWrapper<>();
@@ -315,7 +326,7 @@ public class StructureServiceImpl extends ServiceImpl<StructureMapper, Structure
         );
         //若ids.size == 0，则表示根据名称模糊查询不到数据，则直接返回空structureVO
         if (structureVO != null && ids.size() != 0) {
-            diGui(structureVO, map, structureId, productId, ids);
+            diGui(structureVO, map, structureId, productId, ids, tenantId);
         }
         return structureVO;
     }
@@ -329,19 +340,23 @@ public class StructureServiceImpl extends ServiceImpl<StructureMapper, Structure
     @Override
     public List<PathStructureNameVO> queryPathStructureName(QueryPathStructureNameDTO queryPathStructureNameDTO) {
         log.info("开始处理【查询所有架构路径和路径架构名称】的业务，参数为：{}", queryPathStructureNameDTO);
+
+        PersonnelVO personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
+        Integer tenantId = personnelVO.getTenantId();
+
         Integer productId = queryPathStructureNameDTO.getProductId();
         Integer structureId = queryPathStructureNameDTO.getStructureId();
 
         ArrayList<PathStructureNameVO> pathStructureNames = new ArrayList<>();
 
         log.info("根据产品id查询所有架构数据");
-        HashMap<String, String> map = getStructureIdAndStructureNameMap(productId);
+        HashMap<String, String> map = getStructureIdAndStructureNameMap(productId, tenantId);
         List<StructureVO> structures;
         //若有架构id则只查该架构底下的树，若没有架构id则查整棵产品的架构树
         if (structureId == null) {
-            structures = structureMapper.selectAllByProductId(productId);
+            structures = structureMapper.selectAllByProductId(productId, tenantId);
         } else {
-            structures = structureMapper.selectAllByStructureId(structureId);
+            structures = structureMapper.selectAllByStructureId(structureId, tenantId);
         }
         for (StructureVO structure : structures) {
             Integer id = structure.getId();
@@ -427,8 +442,8 @@ public class StructureServiceImpl extends ServiceImpl<StructureMapper, Structure
     }
 
     //递归组装架构树集合
-    private void diGui(StructureVO structureVO, HashMap<String, String> map, Integer structureId, Integer productId, List<Integer> ids) {
-        List<StructureVO> structureVOs = structureMapper.selectByParentIdAndProductId(structureId, productId, ids);
+    private void diGui(StructureVO structureVO, HashMap<String, String> map, Integer structureId, Integer productId, List<Integer> ids, Integer tenantId) {
+        List<StructureVO> structureVOs = structureMapper.selectByParentIdAndProductId(structureId, productId, ids, tenantId);
         if (structureVOs != null) {
             structureVO.setChildren(structureVOs);
             //给架构的路径名称pathName进行拼接赋值
@@ -444,13 +459,13 @@ public class StructureServiceImpl extends ServiceImpl<StructureMapper, Structure
             }
             for (StructureVO n : structureVOs) {
                 structureId = n.getId();
-                diGui(n, map, structureId, productId, ids);
+                diGui(n, map, structureId, productId, ids, tenantId);
             }
         }
     }
 
-    private HashMap<String, String> getStructureIdAndStructureNameMap(Integer productId) {
-        List<StructureVO> structures = structureMapper.selectAllByProductId(productId);
+    private HashMap<String, String> getStructureIdAndStructureNameMap(Integer productId, Integer tenantId) {
+        List<StructureVO> structures = structureMapper.selectAllByProductId(productId, tenantId);
         //map存储所有架构id(key)和架构名称(value)
         HashMap<String, String> map = new HashMap<>();
         for (StructureVO structure : structures) {

PAS/src/main/resources/mapper/StructureMapper.xml

@@ -5,9 +5,9 @@
     <!--插入数据-->
     <!--int insert(Structure structure);-->
     <insert id="insert" useGeneratedKeys="true" keyProperty="id">
-        insert into structure (parent_id, structure_name, path, remark, product_id, create_person_id,
+        insert into structure (parent_id, structure_name, path, remark, product_id, tenant_id, create_person_id,
                                create_person_name)
-        values (#{parentId}, #{structureName}, #{path}, #{remark}, #{productId}, #{createPersonId},
+        values (#{parentId}, #{structureName}, #{path}, #{remark}, #{productId}, #{tenantId}, #{createPersonId},
                 #{createPersonName});
     </insert>
 
@@ -56,12 +56,14 @@
     </update>
 
     <!--根据父级id和名称和架构id统计数量-->
-    <!--int countByparentIdAndStructureName(Integer parentId, String structureName, Integer structureId);-->
+    <!--int countByparentIdAndStructureName(Integer parentId, String structureName, Integer structureId, Integer tenantId);-->
     <select id="countByparentIdAndStructureName" resultType="int">
         select count(*)
         from structure
-        where parent_id = #{parentId}
+        where
+        parent_id = #{parentId}
         and structure_name = #{structureName}
+        and tenant_id = #{tenantId}
         <if test="structureId != null">
             and id != #{structureId}
         </if>
@@ -109,7 +111,7 @@
     </select>
 
     <!--根据父级id和产品id查询数据-->
-    <!--List<StructureVO> selectByParentIdAndProductId(Integer parentId, Integer productId, List<Integer> ids);-->
+    <!--List<StructureVO> selectByParentIdAndProductId(Integer parentId, Integer productId, List<Integer> ids, Integer tenantId);-->
     <select id="selectByParentIdAndProductId" resultMap="selectByParentIdMap">
         select id s_id,
         parent_id,
@@ -128,6 +130,7 @@
                 #{item}
             </foreach>
         </if>
+        and tenant_id = #{tenantId}
         order by s_id
     </select>
 
@@ -203,7 +206,7 @@
 
 
     <!--根据产品id查询数据-->
-    <!--List<StructureVO> selectAllByProductId(Integer productId);-->
+    <!--List<StructureVO> selectAllByProductId(Integer productId, Integer tenantId);-->
     <select id="selectAllByProductId" resultMap="selectByFindInSetPathMap">
         select id,
                parent_id,
@@ -213,11 +216,12 @@
                product_id
         from structure
         where product_id = #{productId}
+          and tenant_id = #{tenantId}
         order by path
     </select>
 
     <!--根据架构id查询数据-->
-    <!--List<StructureVO> selectAllByStructureId(Integer structureId);-->
+    <!--List<StructureVO> selectAllByStructureId(Integer structureId, Integer tenantId);-->
     <select id="selectAllByStructureId" resultMap="selectByFindInSetPathMap">
         select id,
                parent_id,
@@ -227,6 +231,7 @@
                product_id
         from structure
         where find_in_set(#{structureId}, path)
+          and tenant_id = #{tenantId}
         order by path
     </select>