修改获取用户单位的方法

src/main/java/com/keymobile/indicators/api/hytobacco/TaskRuleCtrl.java

@@ -126,14 +126,11 @@ public class TaskRuleCtrl {
         return levels;
     }
 
-    @ApiOperation("根据规则类型获取任务单位列表")
+    @ApiOperation("根据组织机构编码任务单位列表")
     @GetMapping("findGroupObjs")
-    public List<TaskRuleGroupObj> findGroupObjs(@ApiParam("规则类型：1 省 2 市 3 县")
-                                                    @RequestParam(value = "ruleType", required = false) Integer ruleType,
-                                                @ApiParam("任务级别：省对市  省对县 市对县")
-                                                @RequestParam(value = "ruleLevel", required = false) String ruleLevel) {
-        ruleType = null;
-        return taskRuleService.findRuleGroupObj(ruleType, ruleLevel);
+    public List<TaskRuleGroupObj> findGroupObjs(@ApiParam("组织机构编码")
+                                                    @RequestParam(value = "orgNo", required = false) String orgNo) {
+        return taskRuleService.findRuleGroupObj(null, null, orgNo);
     }
 
     @ApiOperation("根据规则类型获取可配置的角色")

src/main/java/com/keymobile/indicators/model/mapper/indicators/TaskRuleObjMapper.java

@@ -12,13 +12,15 @@ import java.util.List;
 public interface TaskRuleObjMapper extends BaseMapper<TaskRuleGroupObj> {
 
     /**
-     * 根据规则类型、规则层级查找任务单位
+     * 根据规则类型、规则层级、组织机构编号查找任务单位
      * @param ruleType
      * @param ruleLevel
+     * @param orgNo
      * @return
      */
     List<TaskRuleGroupObj> findAllByRuleType(@Param("ruleType") Integer ruleType,
-                                             @Param("ruleLevel") String ruleLevel);
+                                             @Param("ruleLevel") String ruleLevel,
+                                             @Param("orgNo") String orgNo);
 
     /**
      * 根据id查找

src/main/java/com/keymobile/indicators/service/SystemAuthService.java

@@ -51,4 +51,12 @@ public interface SystemAuthService {
     * **/
     @GetMapping("/user/getOrgPath")
     JSONObject getOrgPath(@RequestParam("userIds")List<String> userIds);
+
+    /**
+     * 获取用户所属省/市/县编号
+     * @param id
+     * @return
+     */
+    @GetMapping("getUserOrgNo")
+    String getUserOrgNo(@RequestParam("userid") String id);
 }

src/main/java/com/keymobile/indicators/service/dataenter/TaskRuleService.java

@@ -67,8 +67,9 @@ public interface TaskRuleService {
      * 规则类型
      * @param ruleType
      * @param ruleLevel
+     * @param orgNo
      * @return
      */
-    List<TaskRuleGroupObj> findRuleGroupObj(Integer ruleType,String ruleLevel);
+    List<TaskRuleGroupObj> findRuleGroupObj(Integer ruleType,String ruleLevel, String orgNo);
 
 }

src/main/java/com/keymobile/indicators/service/dataenter/impl/TaskRuleServiceImpl.java

@@ -118,8 +118,8 @@ public class TaskRuleServiceImpl implements TaskRuleService {
     }
 
     @Override
-    public List<TaskRuleGroupObj> findRuleGroupObj(Integer ruleType,String ruleLevel) {
-        return taskRuleObjMapper.findAllByRuleType(ruleType, ruleLevel);
+    public List<TaskRuleGroupObj> findRuleGroupObj(Integer ruleType,String ruleLevel, String orgNo) {
+        return taskRuleObjMapper.findAllByRuleType(ruleType, ruleLevel, orgNo);
     }
 
 

src/main/resources/mybatis/mapping/TaskRuleObjMapper.xml

@@ -11,6 +11,9 @@
         <if test="ruleLevel != null and ruleLevel !=''">
             and rule_level = #{ruleLevel}
         </if>
+        <if test="orgNo != null and orgNo !=''">
+            and org_no = #{orgNo}
+        </if>
         order by update_time desc
     </select>