放开root的退出

src/main/java/com/ejweb/modules/front/report/api/FrontReportController.java

@@ -52,7 +52,7 @@ public class FrontReportController {
                 responseBean.setMessage("captcha is incorrect");
                 return responseBean;
             }
-            if (StringUtils.isNotBlank(bean.getReportSource())){
+            if (StringUtils.isBlank(bean.getReportSource())){
                 responseBean.setStatus(ErrorCode.STATUS_CODE_4002);
                 responseBean.setMessage("report_source为空");
                 return responseBean;

src/main/java/com/ejweb/modules/report/web/ReportController.java

@@ -166,17 +166,16 @@ public class ReportController extends BaseController {
         ReportAttachmentEntity reportAttachment = new ReportAttachmentEntity();
         reportAttachment.setReportId(reportEntity.getId());
         reportAttachment.setAttachmentType("0");
-
+        if (StringUtils.isNoneBlank(reportEntity.getSupplementType())) {
             String supplementType="";
-        String[] supplementTypes={"营销","工程","成本","招采","人力","物业","投诉","行政","财务","商业管理","研发","投资开发"};
-        String typeNumber[]=reportEntity.getSupplementType().split(",");
-        for(int i=0;i<typeNumber.length;i++)
-        {
-            supplementType+=supplementTypes[Integer.valueOf(typeNumber[i])-1]+",";
+            String[] supplementTypes = {"营销", "工程", "成本", "招采", "人力", "物业", "投诉", "行政", "财务", "商业管理", "研发", "投资开发"};
+            String typeNumber[] = reportEntity.getSupplementType().split(",");
+            for (int i = 0; i < typeNumber.length; i++) {
+                supplementType += supplementTypes[Integer.valueOf(typeNumber[i]) - 1] + ",";
             }
-        supplementType=supplementType.substring(0,supplementType.length()-1);
+            supplementType = supplementType.substring(0, supplementType.length() - 1);
             reportEntity.setSupplementType(supplementType);
-
+        }
         List<ReportAttachmentEntity> reportAttachmentList = reportService.getAttachmentInfo(reportAttachment);
         //获取补充提交文件列表
         ReportAttachmentEntity supplementAttachment = new ReportAttachmentEntity();
@@ -231,13 +230,14 @@ public class ReportController extends BaseController {
         List<ReportAttachmentEntity> dealAttachmentList = reportService.getAttachmentInfo(dealAttachment);
         //业务类型
         String supplementTypeStr="";
-        String[] supplementTypes = {"营销","工程","成本","招采","人力","物业","投诉","行政","财务","商业管理","研发","投资开发"};
+        if (StringUtils.isNoneBlank(reportEntity.getSupplementType())) {
+            String[] supplementTypes = {"营销", "工程", "成本", "招采", "人力", "物业", "投诉", "行政", "财务", "商业管理", "研发", "投资开发"};
             String typeNumber[] = reportEntity.getSupplementType().split(",");
-        for(int i = 0;i < typeNumber.length;i++)
-        {
-            supplementTypeStr += supplementTypes[Integer.valueOf(typeNumber[i])-1]+",";
+            for (int i = 0; i < typeNumber.length; i++) {
+                supplementTypeStr += supplementTypes[Integer.valueOf(typeNumber[i]) - 1] + ",";
+            }
+            supplementTypeStr = supplementTypeStr.substring(0, supplementTypeStr.length() - 1);
         }
-        supplementTypeStr = supplementTypeStr.substring(0,supplementTypeStr.length()-1);
         model.addAttribute("page", page);
         model.addAttribute("user", userEntity);
         model.addAttribute("userName", user.getName());