系统功能调整

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java

@@ -21,6 +21,7 @@ import com.njcn.bpm.enums.BpmTaskStatusEnum;
 import com.njcn.bpm.pojo.dto.BpmInstanceInfo;
 import com.njcn.bpm.pojo.dto.BpmProcessInstanceCreateReqDTO;
 import com.njcn.bpm.pojo.param.instance.BpmProcessInstanceCancelParam;
+import com.njcn.common.pojo.constant.PatternRegex;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.device.pms.utils.PubUtil;
@@ -53,6 +54,7 @@ import com.njcn.user.api.DeptFeignClient;
 import com.njcn.user.api.UserFeignClient;
 import com.njcn.user.pojo.dto.DeptDTO;
 import com.njcn.user.pojo.vo.UserVO;
+import com.njcn.web.constant.ValidMessage;
 import com.njcn.web.factory.PageFactory;
 import com.njcn.web.utils.RequestUtil;
 import com.njcn.web.utils.WebUtil;
@@ -69,6 +71,8 @@ import javax.servlet.http.HttpServletResponse;
 import java.beans.PropertyDescriptor;
 import java.time.LocalDate;
 import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -293,6 +297,12 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
      */
     @Override
     public Page<UserReportVO> getUserReport(UserReportParam.UserReportQueryParam userReportQueryParam) {
+        //正则校验
+        Pattern pattern = Pattern.compile(PatternRegex.ALL_CHAR_1_20);
+        Matcher matcher = pattern.matcher(userReportQueryParam.getProjectName());
+        if (!Objects.equals(userReportQueryParam.getProjectName(),"") && !matcher.matches()) {
+            throw new BusinessException(ValidMessage.SEARCH_DATA_ERROR);
+        }
         QueryWrapper<UserReportVO> userReportVOQueryWrapper = new QueryWrapper<>();
         List<String> colleaguesIds = userFeignClient.getColleaguesIdByUserId(RequestUtil.getUserIndex()).getData();
         userReportVOQueryWrapper.in("supervision_user_report.create_by", colleaguesIds)