组织查询修改,单位查询修改,组织置顶添加, 单位置顶添加, 行政区划查询修改

src/main/java/com/whdc/mapper/UnitDictMapper.java

@@ -2,6 +2,7 @@ package com.whdc.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.whdc.model.entity.Organization;
 import org.apache.ibatis.annotations.Param;
 import com.whdc.model.entity.UnitDict;
 
@@ -16,5 +17,7 @@ public interface UnitDictMapper  extends BaseMapper<UnitDict> {
     IPage<UnitDict> page(@Param("page") IPage<UnitDict> page, @Param("dto") UnitDict dto);
 
     List<UnitDict> find(@Param("dto") UnitDict dto);
-    
-    }
+
+    List<UnitDict> findByUserId(@Param("userId") String userId);
+
+}

src/main/java/com/whdc/service/IUnitDictService.java

@@ -20,5 +20,6 @@ public interface IUnitDictService extends IService<UnitDict> {
 
     // 获取所有规则
     List<UnitDict> find(UnitDict dto);
+    List<UnitDict> findByUserId(String userId);
 
 }

src/main/java/com/whdc/service/impl/OrganizationServiceImpl.java

@@ -48,7 +48,7 @@ public class OrganizationServiceImpl extends ServiceImpl<OrganizationMapper, Org
     public List<Organization> findByUserId(String userId) {
         List<Organization> organizations = baseMapper.findByUserId(userId);
 
-        List<UnitDict> list = unitDictService.list();
+        List<UnitDict> list = unitDictService.findByUserId(userId);
 
         List<AdcdTree> tree = adinfoService.tree(null, null);
         Map<Integer, List<UnitDict>> collect = list.stream().collect(Collectors.groupingBy(UnitDict::getOId));

src/main/java/com/whdc/service/impl/UnitDictServiceImpl.java

@@ -32,6 +32,10 @@ public class UnitDictServiceImpl extends ServiceImpl<UnitDictMapper, UnitDict> i
         return baseMapper.find(dto);
     }
 
+    @Override
+    public List<UnitDict> findByUserId(String userId) {
+        return baseMapper.findByUserId(userId);
+    }
 
 
 }

src/main/resources/mapper/UnitDictMapper.xml

@@ -7,7 +7,9 @@
     </select>
 
 
-    <select id="find" resultType="com.whdc.model.entity.UnitDict">
+    <select id="find" resultType="com.whdc.model.entity.UnitDict"></select>
+
+    <select id="findByUserId" resultType="com.whdc.model.entity.UnitDict">
         SELECT
         UD.*,
         F.SORT FSORT