修改错误代码

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

@@ -6,7 +6,7 @@ import lombok.EqualsAndHashCode;
 
 @Data
 //@EqualsAndHashCode(callSuper = false)
-public class QueryOrgReq extends BaseRequest{
+public class QueryOrgReq {
     private String orgCode;
     private String orgId;
     private String parentId;

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

@@ -40,10 +40,9 @@ public class PubOrgController {
     }
 
     @PostMapping("/GetOrgList")
-    @ApiOperation("查询组织机构详细信息")
-    public List<OrgTreeDto> getOrgList(@RequestBody QueryOrgReq req) {
-        List<OrgTreeDto> returnMsg = pubOrgService.getOrgList(req);
-        return returnMsg;
+    @ApiOperation("查询组织树形结构")
+    public ApiRes<List<OrgTreeDto>> getOrgList(@RequestBody QueryOrgReq req) {
+        return ApiRes.success(pubOrgService.getOrgList(req));
     }
     @PostMapping("/GetLowOrg")
     @ApiOperation("根据组织机构查询下一级信息")

jyzb-biz/src/main/java/com/junmp/jyzb/mapper/PubOrgMapper.java

@@ -12,19 +12,9 @@ import java.util.Map;
 public interface PubOrgMapper extends BaseMapper<PubOrg> {
     List<PubOrg> selectAllOrg();
 
-    Long getOnePubOrg(String orgId);
-
-    void setMsg(@Param("id") Long id,@Param("orgName") String orgName);
 
     void setOrgParentIds();
 
     void wipeParentIdsData();
 
-    Map<String, Object> getOrgDetail(String orgId);
-
-    String getParentOrgName(Long orgParentId);
-
-    List<PubOrg> showAllPubOrgList();
-
-    void changeOrgState(@Param("statusFlag") Integer statusFlag,List<String> orgIdList);
 }
\ No newline at end of file

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

@@ -76,10 +76,10 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
         }
 
         //查询传入的组织机构id是否存在
-        Long onePubOrg = pubOrgMapper.getOnePubOrg(policeman.get("orgId").toString());
-        if (onePubOrg == null || onePubOrg.equals("")){
-            return new ResponseResult(HttpStatus.ERROR,ReturnMsg.ERROR,"该组织机构不存在");
-        }
+//        Long onePubOrg = pubOrgMapper.getOnePubOrg(policeman.get("orgId").toString());
+//        if (onePubOrg == null || onePubOrg.equals("")){
+//            return new ResponseResult(HttpStatus.ERROR,ReturnMsg.ERROR,"该组织机构不存在");
+//        }
 
         //查询是否有重复的policeCode
         List<String> policeCodeFlag = policemanMapper.getPoliceByPoliceCode((String) policeman.get("policeCode"));
@@ -241,10 +241,10 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
         }
 
         //查询传入的组织机构id是否存在
-        Long onePubOrg = pubOrgMapper.getOnePubOrg(policeman.get("orgId").toString());
-        if (onePubOrg == null || onePubOrg.equals("")){
-            return new ResponseResult(HttpStatus.ERROR,ReturnMsg.ERROR,"该组织机构不存在");
-        }
+//        Long onePubOrg = pubOrgMapper.getOnePubOrg(policeman.get("orgId").toString());
+//        if (onePubOrg == null || onePubOrg.equals("")){
+//            return new ResponseResult(HttpStatus.ERROR,ReturnMsg.ERROR,"该组织机构不存在");
+//        }
 
         //获取map中的policeCode
         String policeCode = policeman.get("policeCode").toString();

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

@@ -43,14 +43,7 @@ public class PubOrgServiceImpl extends ServiceImpl<PubOrgMapper, PubOrg>  implem
 
     @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;
@@ -182,7 +175,7 @@ public class PubOrgServiceImpl extends ServiceImpl<PubOrgMapper, PubOrg>  implem
                     for (Map<String,Object> msg:children){
                         Long id = (Long) msg.get("id");
                         String orgName = msg.get("orgName").toString();
-                        pubOrgMapper.setMsg(id,orgName);
+//                        pubOrgMapper.setMsg(id,orgName);
                     }
                 }
                 //map.put("children", getChildMenus(menu.getOrgId(),menuList,name1,name2,name3));
@@ -239,13 +232,6 @@ public class PubOrgServiceImpl extends ServiceImpl<PubOrgMapper, PubOrg>  implem
     }
 
 
-
-
-
-
-
-
-
     public List<OrgDto> getLowOrg(QueryOrgReq req){
         if (ObjectUtil.isEmpty(req.getParentId())) {
             req.setParentId(req.getOrgId());

jyzb-biz/src/main/resources/mapper/PubOrgMapper.xml

@@ -45,28 +45,6 @@ WHERE
     del_flag = 1;
    </select>
 
-   <select id="showAllPubOrgList" resultType="com.junmp.jyzb.entity.PubOrg">
-        SELECT org_id,
-        IFNULL(org_id, 'null') as orgId,
-    IFNULL(org_parent_id, 'null') as orgParentId,
-    IFNULL(org_name, 'null') as orgName,
-    IFNULL(d_name, 'null') as dName,
-    IFNULL(find_code, 'null') as findCode,
-    IFNULL(del_flag, 'null') as delFlag
-        FROM pub_org
-   </select>
-
-   <select id="getOnePubOrg" resultType="Long">
-        select org_id
-        from pub_org t
-        where t.org_id =#{orgId}
-    </select>
-
-    <update id="setMsg">
-        update pub_org
-        set d_name =#{orgName}
-        where org_id = #{id}
-    </update>
 
     <update id="wipeParentIdsData">
         UPDATE pub_org t
@@ -119,12 +97,5 @@ SET p.org_parent_ids = cte.org_parent_ids;
         select d_name from pub_org o where org_id =#{orgParentId}
 </select>
 
-<update id="changeOrgState">
-  UPDATE pub_org
-  SET status_flag = #{statusFlag}
-  WHERE org_id IN
-    <foreach item="item" collection="orgIdList" open="(" separator="," close=")">
-      #{item}
-    </foreach>
-</update>
+
 </mapper>
\ No newline at end of file