修改null bug

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

@@ -50,10 +50,11 @@ public class TaskRuleCtrl {
                                      @RequestParam(value = "ruleLevel", required = false) String ruleLevel,
                                      @ApiParam("搜索关键字（名字）")@RequestParam(value = "keyword", required=false) String keyword,
                                      @ApiParam("页码，从1开始") @RequestParam(value ="page",defaultValue = "1") int page,
-                                     @ApiParam("每页条数")
-                                         @RequestParam(value ="pageSize", defaultValue = "10") int pageSize) {
+                                     @ApiParam("每页条数") @RequestParam(value ="pageSize", defaultValue = "10") int pageSize,
+                                     @ApiParam("机构编号") @RequestParam(value = "orgNo",required=false) String orgNo,
+                                     @ApiParam("是否是管理员") @RequestParam(value = "sysAdmin",required=false) Boolean sysAdmin) {
         ruleType = null;
-        return taskRuleService.findRuleByPage(ruleType, ruleLevel, keyword, page, pageSize);
+        return taskRuleService.findRuleByPage(ruleType, ruleLevel, keyword, page, pageSize,orgNo,sysAdmin);
     }
 
     @ApiOperation("根据id获取任务规则")
@@ -74,10 +75,30 @@ public class TaskRuleCtrl {
     @PostMapping("save")
     public Result save(@RequestBody TaskRule rule) {
         Result result = null;
+
+        String orgNo = rule.getOrgNo();
+        int orgType=0;
+        if(orgNo!=null&&orgNo!=""){
+            int size = orgNo.length();
+            if(size==2){
+                orgType = Constants.RULE_TYPE_PROVINCE;
+            }else if(size==4){
+                orgType =  Constants.RULE_TYPE_CITY;
+            }else if(size==6){
+                orgType = Constants.RULE_TYPE_COUNTY;
+            }
+        }
+        if(orgType==0){
+            return Result.genFailedResult("没有该操作权限!");
+        }
+        rule.setOrgType(orgType);
+
         TaskRule temp = taskRuleService.findRuleByName(rule.getRuleLevel(), rule.getName());
         if (temp != null && !temp.getId().equals(rule.getId())) {
             result = Result.genFailedResult("已经存在同名任务规则定义!");
-        } else {
+        } else if(temp!=null && temp.getOrgType()!=orgType){
+            result = Result.genFailedResult("没有该操作权限!");
+        }else {
             Date now = new Date();
             String currentUserId = SystemUserUtil.getCurrentUserId();
             rule.setUpdater(currentUserId);

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

@@ -41,7 +41,7 @@ public interface TaskRuleMapper extends BaseMapper<TaskRule> {
      * @return
      */
     List<TaskRule> findRuleByPage(@Param("ruleType") Integer ruleType, @Param("ruleLevel") String ruleLevel, @Param("keyword") String keyword,
-                                  @Param("start") long start, @Param("pageSize") int pageSize);
+                                  @Param("start") long start, @Param("pageSize") int pageSize,@Param("orgType") Integer orgType);
 
     /**
      * 查询填报任务规则总数
@@ -50,5 +50,5 @@ public interface TaskRuleMapper extends BaseMapper<TaskRule> {
      * @param keyword
      * @return
      */
-    long findRuleCount(@Param("ruleType") Integer ruleType, @Param("ruleLevel") String ruleLevel, @Param("keyword") String keyword);
+    long findRuleCount(@Param("ruleType") Integer ruleType, @Param("ruleLevel") String ruleLevel, @Param("keyword") String keyword,@Param("orgType") Integer orgType);
 }

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

@@ -61,7 +61,7 @@ public interface TaskRuleService {
      * @param pageSize
      * @return
      */
-    Page<TaskRule> findRuleByPage(Integer ruleType, String ruleLevel, String keyword, int page, int pageSize);
+    Page<TaskRule> findRuleByPage(Integer ruleType, String ruleLevel, String keyword, int page, int pageSize,String orgNo,Boolean sysAdmin);
 
     /**
      * 规则类型

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

@@ -10,6 +10,8 @@ import com.keymobile.indicators.model.mapper.indicators.TaskRuleObjMapper;
 import com.keymobile.indicators.service.dataenter.TaskRuleService;
 import com.keymobile.indicators.service.dataenter.TaskService;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang.BooleanUtils;
+import org.apache.commons.lang.StringUtils;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -57,20 +59,7 @@ public class TaskRuleServiceImpl implements TaskRuleService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void createRule(TaskRule rule) {
-        String orgNo = rule.getOrgNo();
-        int orgType=0;
-        if(orgNo!=null&&orgNo!=""){
-            int size = orgNo.length();
-            if(size==2){
-                orgType = Constants.RULE_TYPE_PROVINCE;
-            }else if(size==4){
-                orgType =  Constants.RULE_TYPE_CITY;
-            }else if(size==6){
-                orgType = Constants.RULE_TYPE_COUNTY;
-            }
-        }
 
-        rule.setOrgType(orgType);
         rule.setState(Constants.DATA_STATE_A);
         taskRuleMapper.insert(rule);
         saveRuleIndicators(rule);
@@ -111,12 +100,27 @@ public class TaskRuleServiceImpl implements TaskRuleService {
     }
 
     @Override
-    public Page<TaskRule> findRuleByPage(Integer ruleType, String ruleLevel, String keyword, int page, int pageSize) {
-        long total = taskRuleMapper.findRuleCount(ruleType, ruleLevel, keyword);
+    public Page<TaskRule> findRuleByPage(Integer ruleType, String ruleLevel, String keyword, int page, int pageSize,String orgNo,Boolean sysAdmin) {
+
+        Integer oryType = null;
+        boolean tmp = true;
+        if(!BooleanUtils.isTrue(sysAdmin)){
+            if(StringUtils.isNotBlank(orgNo)){
+                oryType = orgNo.length()/2;
+            }else{
+                //不是省市县任何一种类型且不是管理员
+                tmp = false;
+            }
+        }
+        long total =0;
+        if(tmp){
+            total =taskRuleMapper.findRuleCount(ruleType, ruleLevel, keyword,oryType);
+        }
+
         PageRequest request = PageRequest.of(page - 1, pageSize);
         List<TaskRule> list = new ArrayList<>();
         if (total > 0) {
-           list = taskRuleMapper.findRuleByPage(ruleType, ruleLevel, keyword, request.getOffset(), pageSize);
+           list = taskRuleMapper.findRuleByPage(ruleType, ruleLevel, keyword, request.getOffset(), pageSize,oryType);
         }
         Page<TaskRule> pageResult = new PageImpl<TaskRule>(list, request, total);
         return pageResult;

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

@@ -43,6 +43,9 @@
 		<if test="keyword != null and keyword != ''">
 			and rule.name like concat('%', #{keyword}, '%')
 		</if>
+		<if test="orgType != null">
+			and rule.org_type = #{orgType}
+		</if>
 	</sql>
 	<select id="findRuleCount" resultType="long">
 		select  count(id)