修改组织机构相关

jyzb-api/pom.xml

@@ -46,4 +46,6 @@
 
 
     </dependencies>
+
 </project>
+

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/OrgDto.java

+package com.junmp.jyzb.api.bean.dto;
+
+import lombok.Data;
+
+@Data
+public class OrgDto {
+    private Long orgId;
+    private String orgName;
+    private String orgCode;
+    private Integer isDepartment;
+    private Long orgParentId;
+    private String areaName;
+    private String levelFlag;
+    private String dName;
+
+}

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/OrgTreeDto.java

 package com.junmp.jyzb.api.bean.dto;
 
 import lombok.Data;
+import org.springframework.beans.BeanUtils;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
 @Data
-public class OrgTreeDto {
+public class OrgTreeDto implements Serializable {
+    private Long orgId;
     private String name;
     private String code;
     private Integer type;
-    private List<OrgTreeDto> child = new ArrayList<>();
+    private Long orgParentId;
+    private String areaName;
+    private String levelFlag;
+    private String dName;
+    private transient List<OrgTreeDto> child = new ArrayList<>();
+
     public void addChild(OrgTreeDto child) {
         this.child.add(child);
     }
+    public OrgTreeDto copyIngnoreChildren() {
+        OrgTreeDto desBean = new OrgTreeDto();
+        BeanUtils.copyProperties(this, desBean, "children", "info");
+        return desBean;
+    }
 }
 
 

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/QueryOrgReq.java

@@ -5,9 +5,13 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 @Data
-//@EqualsAndHashCode(callSuper = true)
-public class QueryOrgReq {
+//@EqualsAndHashCode(callSuper = false)
+public class QueryOrgReq extends BaseRequest{
     private String orgCode;
+    private String orgId;
+    private String parentId;
+    private Integer isDepartment;
+    private Integer level;
 }
 
 

jyzb-biz/pom.xml

@@ -46,12 +46,12 @@
             <groupId>com.junmp.v2</groupId>
             <artifactId>auth-sdk</artifactId>
         </dependency>
-
         <dependency>
             <groupId>com.junmp.jyzb</groupId>
             <artifactId>jyzb-common</artifactId>
             <version>1.0.0</version>
         </dependency>
+
         <dependency>
             <groupId>com.junmp.v2</groupId>
             <artifactId>v2-log-api</artifactId>
@@ -70,9 +70,5 @@
             <groupId>com.junmp.jyzb</groupId>
             <artifactId>jyzb-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.junmp.jyzb</groupId>
-            <artifactId>jyzb-api</artifactId>
-        </dependency>
     </dependencies>
 </project>

jyzb-biz/src/main/java/com/junmp/jyzb/controller/PubOrgController.java

 package com.junmp.jyzb.controller;
 
+import com.junmp.jyzb.api.bean.dto.OrgDto;
 import com.junmp.jyzb.api.bean.dto.OrgTreeDto;
 import com.junmp.jyzb.api.bean.query.QueryOrgReq;
 import com.junmp.jyzb.service.PubOrgService;
@@ -8,10 +9,8 @@ import com.junmp.v2.common.bean.response.ApiRes;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.lang.Nullable;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -25,14 +24,7 @@ public class PubOrgController {
     @Resource
     public PubOrgService pubOrgService;
 
-    @PostMapping("/ShowPubOrgList")
-    @ApiOperation("查询组织机构列表_简化版")
-    public ApiRes<List<Map<String,Object>>> ShowEquipmentList(@RequestBody Map<String, Object> orgId) {
-        return ApiRes.success(pubOrgService.showPubOrgList(orgId));
-    }
-
-
-    @PostMapping("/SetOrgParentIds")
+    @GetMapping("/SetOrgParentIds")
     @ApiOperation("填充组织机构的parent_ids字段")
     public ResponseResult setOrgParentIds() {
         //传入当前的组织机构id，展示所有本级及下级的
@@ -47,18 +39,15 @@ public class PubOrgController {
         return returnMsg;
     }
 
-    @PostMapping("/GetOrgDetail")
+    @PostMapping("/GetOrgList")
     @ApiOperation("查询组织机构详细信息")
-    public List<OrgTreeDto> getOrgDetail(@RequestBody QueryOrgReq req) {
+    public List<OrgTreeDto> getOrgList(@RequestBody QueryOrgReq req) {
         List<OrgTreeDto> returnMsg = pubOrgService.getOrgList(req);
         return returnMsg;
     }
-
-    @PostMapping("/GetLowerOrg")
-    @ApiOperation("获取本级及下级的组织机构")
-    public ResponseResult getLowerOrg(@RequestBody Map<String, Object> msg) {
-        String orgId = msg.get("orgId").toString();
-        List<String> returnMsg = pubOrgService.getLowerOrg(orgId);
-        return new ResponseResult(99200,"操作成功",returnMsg);
+    @PostMapping("/GetLowOrg")
+    @ApiOperation("根据组织机构查询下一级信息")
+    public ApiRes<List<OrgDto>> getLowOrg(@RequestBody QueryOrgReq req) {
+        return ApiRes.success(pubOrgService.getLowOrg(req)) ;
     }
 }

jyzb-biz/src/main/java/com/junmp/jyzb/entity/PubOrg.java

@@ -25,6 +25,12 @@ public class PubOrg implements Serializable {
      */
     @TableId(type = IdType.AUTO, value = "org_id")
     private Long orgId;
+    /**
+     * 主键
+     */
+    @TableField(value = "is_department")
+    private Integer isDepartment;
+
 
     /**
      * 父id，一级节点父id是0
@@ -61,7 +67,6 @@ public class PubOrg implements Serializable {
      */
     @TableField(value = "sort_val")
     private Integer sortVal;
-
     /**
      * 状态：1-启用，0-禁用
      */
@@ -194,5 +199,5 @@ public class PubOrg implements Serializable {
     @TableField(value = "org_name")
     private String orgName;
 
-//    private static final long serialVersionUID = 1L;
+
 }
\ No newline at end of file

jyzb-biz/src/main/java/com/junmp/jyzb/enums/MsgType.java

+package com.junmp.jyzb.enums;
+
+import lombok.Getter;
+
+/**
+ * 消息类型
+ *
+ * @author FCG
+ */
+@Getter
+public enum MsgType {
+    /**
+     * news，有效时间24h
+     */
+    News("news", 24 * 60 * 60 * 1000),
+    Video("video", 24 * 60 * 60 * 1000),
+    Goods("goods", 7 * 24 * 60 * 60 * 1000);
+
+    private String name;
+    /**
+     * time to live,(ms)
+     */
+    private long ttl;
+
+    MsgType(String name, long ttl) {
+        this.name = name;
+        this.ttl = ttl;
+    }
+}
\ No newline at end of file

jyzb-biz/src/main/java/com/junmp/jyzb/service/PubOrgService.java

 package com.junmp.jyzb.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.junmp.jyzb.api.bean.dto.OrgDto;
 import com.junmp.jyzb.api.bean.dto.OrgTreeDto;
 import com.junmp.jyzb.api.bean.query.QueryOrgReq;
-import com.junmp.jyzb.api.bean.req.OrgUpdateReq;
 import com.junmp.jyzb.utils.ResponseResult;
 
 import java.util.List;
@@ -12,8 +12,6 @@ import com.junmp.jyzb.entity.PubOrg;
 
 public interface PubOrgService extends IService<PubOrg> {
 
-    List<Map<String,Object>> showPubOrgList(Map<String, Object> orgId);
-
 
     ResponseResult setShortName(Map<String, Object> orgId);
 
@@ -22,6 +20,6 @@ public interface PubOrgService extends IService<PubOrg> {
     ResponseResult setOrgParentIds();
 
     List<OrgTreeDto> getOrgList(QueryOrgReq req);
-//    public List<OrgTreeDto> getEquipmentList(QueryOrgReq req)
-    ResponseResult changeOrgState(OrgUpdateReq req);
+    List<OrgDto> getLowOrg(QueryOrgReq req);
+
 }

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/EquipmentTypeServiceImpl.java

@@ -77,9 +77,11 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E
             selfCode=id;
             EquipmentType et=this.getById(id);
             EquipmentTreeDto equipmentTypeDTO = new EquipmentTreeDto();
+
             equipmentTypeDTO.setName(et.getName());
             equipmentTypeDTO.setCode(et.getCode());
             equipmentTypeDTO.setType(et.getType());
+
             equipmentDtoMap.put(et.getId(),equipmentTypeDTO);
         }
 

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PolicemanServiceImpl.java

@@ -571,23 +571,6 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
 
         List<Map<String, Object>> allPoliceman = new ArrayList<>();
 
-//        // 构建 Redis 缓存键
-//        String redisKey = REDIS_ORG + msg.get("IncludeLowerLevel").toString() +'_'+ msg.get("orgId").toString();
-//        // 从 Redis 中获取数据
-//        List<Map<String, Object>> cachedData = redisUtils.findCachedData(redisKey);
-//        if (cachedData != null) {
-//            //将Long类型的数据转化为Date
-//            for (Map<String,Object> one:cachedData){
-//                //如果updateTime的类型为Long
-//                Long dataMsg = (Long) one.get("updateTime");
-//                one.put("updateTime", redisUtils.getDate(dataMsg));
-//                allPoliceman.add(one);
-//            }
-//            //按照updateTime降序排序
-//            //DateTimeUtil.timeSort(allPoliceman);
-//            return new ResponseResult(HttpStatus.SUCCESS,ReturnMsg.PASS,allPoliceman);
-//        }
-
         //如果组织机构是浙江省公安厅
         if (msg.get("orgId").toString().equals("1369509498032808905") && msg.get("IncludeLowerLevel").toString().equals("true")){
             allPoliceman = policemanMapper.getAllPolice();

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PubOrgServiceImpl.java

 package com.junmp.jyzb.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.junmp.jyzb.api.bean.dto.EquipmentTreeDto;
+import com.junmp.jyzb.api.bean.dto.OrgDto;
 import com.junmp.jyzb.api.bean.dto.OrgTreeDto;
 import com.junmp.jyzb.api.bean.query.QueryEquipmentTypeReq;
 import com.junmp.jyzb.api.bean.query.QueryOrgReq;
 import com.junmp.jyzb.api.bean.req.OrgUpdateReq;
 import com.junmp.jyzb.api.bean.query.ProductTagReq;
 import com.junmp.jyzb.entity.EquipmentType;
+import com.junmp.jyzb.entity.ProductTag;
 import com.junmp.jyzb.entity.PubOrg;
+import com.junmp.jyzb.entity.Supplier;
 import com.junmp.jyzb.utils.HttpStatus;
 import com.junmp.jyzb.utils.RedisUtils;
 import com.junmp.jyzb.utils.ResponseResult;
 import com.junmp.jyzb.utils.ReturnMsg;
+import com.junmp.v2.common.util.BeanPlusUtil;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.connection.DataType;
+import org.springframework.data.redis.core.ListOperations;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
+import org.springframework.lang.Nullable;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import com.junmp.jyzb.mapper.PubOrgMapper;
 import com.junmp.jyzb.service.PubOrgService;
 
 import java.util.*;
-import java.util.stream.Collectors;
 
-import static com.junmp.jyzb.utils.CheckBlank.checkNotBlank;
 
 @Service
 public class PubOrgServiceImpl extends ServiceImpl<PubOrgMapper, PubOrg>  implements PubOrgService{
 
     @Resource
     private PubOrgMapper pubOrgMapper;
+    private static final String NAME_SPACE = "ORG_TREE";
+    private static final String DELIMIT = ":";
+    @Resource(name = "redisTemplate")
+    private RedisTemplate redisTemplate;
+    @Resource(name = "redisTemplate")
+    private ListOperations listOperations;
+    @Resource(name = "redisTemplate")
+    private ValueOperations valueOperations;
 
     @Autowired
     private RedisUtils redisUtils;
 
-    public List<Map<String,Object>> showPubOrgList(Map<String, Object> orgId) {
-        // 构建 Redis 缓存键
-        String redisKey = "showPubOrgList";
-
-        Long orgInfo = Long.valueOf(orgId.get("orgId").toString());//获取输入的组织机构id信息
-
-        // 从 Redis 中获取数据
-        List<PubOrg> cachedData = redisUtils.findCachedData(redisKey);
-        List<PubOrg> menuList = new ArrayList<>();
-        if (cachedData != null) {
-            menuList = cachedData;
-        } else {
-            // 从数据库获取数据并将结果存入 Redis 缓存
-            menuList = pubOrgMapper.selectAllOrg();
-            redisUtils.set(redisKey, menuList);
-        }
-
-        List<Map<String, Object>> topList = new ArrayList<>();
-        List<Map<String, Object>> resultList = new ArrayList<>();
-        Map<Long, List<Map<String, Object>>> childrenMap = new HashMap<>();
-
-        // 构建子菜单映射表
-        for (PubOrg menu : menuList) {
-            Map<String, Object> map = new HashMap<>();
-            map.put("id", menu.getOrgId());
-            map.put("parentId", menu.getOrgParentId());
-            map.put("findCode", menu.getFindCode());
-            map.put("orgName", menu.getDName());
-            map.put("statusFlag",menu.getStatusFlag());
-
-            if (!childrenMap.containsKey(menu.getOrgParentId())) {
-                childrenMap.put(menu.getOrgParentId(), new ArrayList<>());
-            }
-            childrenMap.get(menu.getOrgParentId()).add(map);
-
-            //构建最顶级的菜单
-            if (menu.getOrgId().equals(orgInfo)){
-                Map<String, Object> topMap = new HashMap<>();
-                topMap.put("id", menu.getOrgId());
-                topMap.put("parentId", menu.getOrgParentId());
-                topMap.put("findCode", menu.getFindCode());
-                topMap.put("orgName", menu.getDName());
-                topMap.put("statusFlag",menu.getStatusFlag());
-                topList.add(topMap);
-            }
-        }
-
-        // 获取顶级菜单
-        List<Map<String, Object>> topMenus = childrenMap.get(orgInfo);
-
-        // 迭代构建菜单树
-        if (topMenus != null) {
-
-            for (Map<String, Object> topMenu : topMenus) {
-                Stack<Map<String, Object>> stack = new Stack<>();
-                stack.push(topMenu);
-
-                // 使用栈进行深度优先遍历
-                while (!stack.isEmpty()) {
-                    Map<String, Object> currentMenu = stack.pop();
-                    Long currentMenuId = (Long) currentMenu.get("id");
-
-                    if (childrenMap.containsKey(currentMenuId)) {
-                        List<Map<String, Object>> children = childrenMap.get(currentMenuId);
-                        currentMenu.put("children", children);
-
-                        for (int i = children.size() - 1; i >= 0; i--) {
-                            stack.push(children.get(i));
-                        }
-                    }
-                }
-                resultList.add(topMenu);
-            }
-        }
-
-        if (orgInfo == -1) {
-            //modifyList(resultList);
-
-            // 如果输入的是浙江省公安厅,就将下级的组织机构进行排序
-            for (Map<String, Object> orgMsg : resultList) {
-                List<Map<String, Object>> children = (List<Map<String, Object>>) orgMsg.get("children");
-                // 根据findCode从小到大排序
-                children.sort(Comparator.comparing(m -> m.get("findCode").toString()));
-            }
-
-            return resultList;
-        }
-
-        //将resultList的内容放在顶级菜单的resultList中
-        for (Map<String,Object> oneMap:topList){
-            oneMap.put("children",resultList);
-        }
-
-        // 遍历并添加父类的相关信息到children的第一个位置
-        modifyList(topList);
-
-        if (orgInfo.equals(1369509498032808905L)) {
-            // 如果输入的是浙江省公安厅,就将下级的组织机构进行排序
-            for (Map<String, Object> orgMsg : topList) {
-                List<Map<String, Object>> children = (List<Map<String, Object>>) orgMsg.get("children");
-                // 根据findCode从小到大排序
-                children.sort(Comparator.comparing(m -> m.get("findCode").toString()));
-            }
-            return topList;
-        }
-
-        // 返回结果
-        return topList;
-    }
-
-    //将父类信息放在children的第一个位置
-    private static void modifyList(List<Map<String, Object>> list) {
-        for (Map<String, Object> item : list) {
-            // 获取当前节点的ID
-            Map<String,Object> setMsg = new HashMap<>();
-            setMsg.put("id", item.get("id").toString() + "-0"); //在最后面加个 -0 来表示列表的唯一id
-            setMsg.put("parentId", item.get("parentId").toString());
-            setMsg.put("findCode", item.get("findCode").toString());
-            setMsg.put("orgName", item.get("orgName").toString());
-            setMsg.put("statusFlag",item.get("statusFlag"));
-
-            // 将当前节点的ID添加到子节点的第一个位置
-            @SuppressWarnings("unchecked")
-            List<Map<String, Object>> children = (List<Map<String, Object>>) item.get("children");
-            if (children != null && children.size() > 0) {
-                //将父类的相关信息放在children的第一个位置
-                children.add(0,setMsg);
-
-                // 递归处理子节点
-                modifyList(children);
-            }
-        }
-    }
-
-    //删除前缀
-    public static Map<String,Object> removeFront(Map<String,Object> map, String name1,List<String> name2,List<String> name3) {
-        String orgName = map.get("orgName").toString();
-
-        orgName = removeStringAndBefore(orgName,name1);
-
-        for (String name:name2){
-            orgName = removePrefix(orgName,name);
-            for (String staticName:name3){
-                orgName = removePrefix(orgName,staticName);
-            }
-        }
-        map.put("orgName",orgName);
-        return map;
-    }
-
-    //找到字符串出现的位置，删掉字符串及前缀
-    public static String removeStringAndBefore(String name, String deleteMsg) {
-        int index = name.indexOf(deleteMsg);
-        if (index != -1) {
-            return name.substring(index + deleteMsg.length());
-        }
-        return name;
-    }
 
     //例：传入abc,a ==>bc 删掉开头的字符串，不是就不删除
     public static String removePrefix(String name, String deleteName) {
@@ -269,6 +131,7 @@ public class PubOrgServiceImpl extends ServiceImpl<PubOrgMapper, PubOrg>  implem
         return resultList;
     }
 
+
     @Override
     public ResponseResult setOrgParentIds() {
         //清空parent_ids字段
@@ -375,29 +238,92 @@ public class PubOrgServiceImpl extends ServiceImpl<PubOrgMapper, PubOrg>  implem
         return childList;
     }
 
-//    @Override
-//    public ResponseResult getOrgDetail(QueryOrgReq msg) {
-//        try {
-//            checkNotBlank(msg.get("orgId"), "orgId不能为空");
-//        } catch (IllegalArgumentException e) {
-//            return new ResponseResult(HttpStatus.ERROR, ReturnMsg.ERROR,e.getMessage());
-//        }
-//
-//        String orgId = msg.get("orgId").toString();
-//
-//        Map<String,Object> resultList = pubOrgMapper.getOrgDetail(orgId);
-//        return new ResponseResult(HttpStatus.SUCCESS, "操作成功", resultList);
-//    }
+
+
+
+
+
+
+
+
+    public List<OrgDto> getLowOrg(QueryOrgReq req){
+        if (ObjectUtil.isEmpty(req.getParentId())) {
+            req.setParentId(req.getOrgId());
+        }
+
+        LambdaQueryWrapper<PubOrg> wp= this.createWrapper(req);
+        List<PubOrg> list = this.list(wp);
+        List<OrgDto> orgs=new ArrayList<>();
+        Comparator<PubOrg> orgComparator = (org1, org2) -> {
+            String orgCode1 = org1.getOrgCode();
+            String orgCode2 = org2.getOrgCode();
+
+            // 判断是否包含字母
+            boolean hasLetter1 = orgCode1.matches(".*[a-zA-Z]+.*");
+            boolean hasLetter2 = orgCode2.matches(".*[a-zA-Z]+.*");
+
+            // 如果其中一个包含字母，则将其放到排序的最后
+            if (hasLetter1 && !hasLetter2) {
+                return 1; // orgCode1包含字母，orgCode2不包含字母，orgCode1排在orgCode2后面
+            } else if (!hasLetter1 && hasLetter2) {
+                return -1; // orgCode1不包含字母，orgCode2包含字母，orgCode1排在orgCode2前面
+            }
+
+            // 如果两个orgCode都不含有字母，则按照每两位进行排序
+            String[] orgCodeArray1 = orgCode1.split("(?<=\\G..)");
+            String[] orgCodeArray2 = orgCode2.split("(?<=\\G..)");
+
+            // 从最后一组（即最后两位）开始比较数字大小
+            int index1 = orgCodeArray1.length - 1;
+            int index2 = orgCodeArray2.length - 1;
+            while (index1 >= 0 && index2 >= 0) {
+                String codeValue1 = orgCodeArray1[index1];
+                String codeValue2 = orgCodeArray2[index2];
+
+                // 判断是否可以转换为整数，如果不能，则说明包含字母，直接返回结果
+                try {
+                    int intValue1 = Integer.parseInt(codeValue1, 10);
+                    int intValue2 = Integer.parseInt(codeValue2, 10);
+                    int compareResult = Integer.compare(intValue1, intValue2);
+                    if (compareResult != 0) {
+                        return compareResult;
+                    }
+                } catch (NumberFormatException e) {
+                    // orgCode包含字母，直接返回结果
+                    return codeValue1.compareTo(codeValue2);
+                }
+
+                index1--;
+                index2--;
+            }
+
+            // 如果orgCode长度不同，那么较长的orgCode排在后面
+            return Integer.compare(orgCodeArray1.length, orgCodeArray2.length);
+        };
+        Collections.sort(list, orgComparator);
+
+        list.forEach(p->{
+            OrgDto org=new OrgDto();
+            BeanPlusUtil.copyProperties(p, org);
+
+            orgs.add(org);
+        });
+        return orgs;
+    }
 
     public List<OrgTreeDto> getOrgList(QueryOrgReq req) {
+
         String selfCode = "1369509498032808905";
         List<OrgTreeDto> OrgDTOList=new ArrayList<>();
         LambdaQueryWrapper<PubOrg> wrapper = new LambdaQueryWrapper<>();
-        String setNewCode = "";
+        String setNewCode;
         List<PubOrg> orgList = new ArrayList<>();
         if (ObjectUtil.isNotEmpty(req.getOrgCode())) {
             setNewCode = req.getOrgCode().replaceAll("0+$", "");
+        } else {
+            setNewCode = "";
         }
+        wrapper.eq(ObjectUtil.isNotEmpty(req.getIsDepartment()), PubOrg::getIsDepartment, req.getIsDepartment());
         wrapper.eq( PubOrg::getStatusFlag, 1);
         wrapper.likeRight(ObjectUtil.isNotEmpty(req.getOrgCode()), PubOrg::getOrgCode, setNewCode);
         orgList = this.list(wrapper);
@@ -417,6 +343,7 @@ public class PubOrgServiceImpl extends ServiceImpl<PubOrgMapper, PubOrg>  implem
             selfCode = id;
             PubOrg org = this.getById(Long.parseLong(id));
             OrgTreeDto orgDTO = new OrgTreeDto();
+            BeanPlusUtil.copyProperties(org, orgDTO);
             orgDTO.setName(org.getDName());
             orgDTO.setCode(org.getOrgCode());
             orgDTO.setType(org.getOrgType());
@@ -426,6 +353,7 @@ public class PubOrgServiceImpl extends ServiceImpl<PubOrgMapper, PubOrg>  implem
         // 第一轮遍历：创建 OrgTreeDto 对象并将其加入到 Map 中
         for (PubOrg org : orgList) {
             OrgTreeDto orgDTO = new OrgTreeDto();
+            BeanPlusUtil.copyProperties(org, orgDTO);
             orgDTO.setName(org.getDName());
             orgDTO.setCode(org.getOrgCode());
             orgDTO.setType(org.getOrgType());
@@ -460,19 +388,19 @@ public class PubOrgServiceImpl extends ServiceImpl<PubOrgMapper, PubOrg>  implem
 
         return OrgDTOList;
     }
-    @Override
-    public ResponseResult changeOrgState(OrgUpdateReq req) {
-        LambdaQueryWrapper<PubOrg> wrapper = new LambdaQueryWrapper<>();
-
 
-        return new ResponseResult(HttpStatus.SUCCESS,ReturnMsg.PASS);
-    }
-
-    private LambdaQueryWrapper<PubOrg> createWrapper(ProductTagReq req) {
+    private LambdaQueryWrapper<PubOrg> createWrapper(QueryOrgReq req) {
         LambdaQueryWrapper<PubOrg> wrapper = new LambdaQueryWrapper<>();
         if (ObjectUtil.isEmpty(req)) {
             return wrapper;
         }
+        wrapper.eq(ObjectUtil.isNotEmpty(req.getIsDepartment()), PubOrg::getIsDepartment, req.getIsDepartment());
+        //根据业务编码查询
+        wrapper.eq(ObjectUtil.isNotEmpty(req.getLevel()), PubOrg::getLevelFlag, req.getLevel());
+        wrapper.eq(ObjectUtil.isNotEmpty(req.getOrgId()), PubOrg::getOrgId,req.getOrgId());
+        wrapper.eq(ObjectUtil.isNotEmpty(req.getParentId()), PubOrg::getOrgParentId,Long.parseLong(req.getParentId())  );
+        wrapper.eq(ObjectUtil.isNotEmpty(req.getOrgCode()), PubOrg::getOrgCode, req.getOrgCode());
+
 
         return wrapper;
     }

jyzb-boot/src/main/resources/.idea/.gitignore

+# 默认忽略的文件
+/shelf/
+/workspace.xml
+# 基于编辑器的 HTTP 客户端请求
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
+# Zeppelin 忽略的文件
+/ZeppelinRemoteNotebooks/

jyzb-boot/src/main/resources/.idea/misc.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>
\ No newline at end of file

jyzb-boot/src/main/resources/.idea/modules.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/resources.iml" filepath="$PROJECT_DIR$/.idea/resources.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file

jyzb-boot/src/main/resources/.idea/resources.iml

+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file

jyzb-boot/src/main/resources/.idea/vcs.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/../../../.." vcs="Git" />
+  </component>
+</project>
\ No newline at end of file

pom.xml

@@ -13,7 +13,7 @@
         <module>jyzb-api</module>
         <module>jyzb-boot</module>
         <module>jyzb-biz</module>
-<!--        <module>jyzb-process</module>-->
+        <module>jyzb-process</module>
         <module>jyzb-common</module>
         <module>jyzb-mq</module>
     </modules>
@@ -110,13 +110,11 @@
                 <artifactId>v2-config-boot-starter</artifactId>
                 <version>${junmp.v2.version}</version>
             </dependency>
-
             <dependency>
                 <groupId>com.junmp.v2</groupId>
                 <artifactId>v2-db-boot-starter</artifactId>
                 <version>${junmp.v2.version}</version>
             </dependency>
-
             <dependency>
                 <groupId>com.junmp.v2</groupId>
                 <artifactId>v2-log-boot-starter</artifactId>