Browse Source

fix:角色新增时排序号为null导致的报错问题

wangzaijun 7 months ago
parent
commit
7b4dfc99f1

+ 1 - 1
service-base/src/main/java/com/simuwang/base/pojo/dto/sys/RoleAddCmd.java

@@ -37,7 +37,7 @@ public class RoleAddCmd extends BaseAddCmd<SysRoleDO> {
         SysRoleDO entity = new SysRoleDO();
         SysRoleDO entity = new SysRoleDO();
         entity.setRoleName(this.roleName);
         entity.setRoleName(this.roleName);
         entity.setRoleKey(this.roleKey);
         entity.setRoleKey(this.roleKey);
-        entity.setRoleSort(this.roleSort);
+        entity.setRoleSort(this.roleSort == null ? 10 : this.roleSort);
         entity.setStatus(this.status);
         entity.setStatus(this.status);
         entity.setRemark(this.remark);
         entity.setRemark(this.remark);
         return entity;
         return entity;

+ 2 - 2
service-daq/src/main/java/com/simuwang/daq/components/PDMonthlyReportParser.java

@@ -34,8 +34,8 @@ import java.util.stream.Collectors;
  */
  */
 @Component("monthly-report:pdf")
 @Component("monthly-report:pdf")
 public class PDMonthlyReportParser extends AbstractReportParser<MonthlyReportNavInfo> {
 public class PDMonthlyReportParser extends AbstractReportParser<MonthlyReportNavInfo> {
-    private final EmailFieldMappingMapper fieldMappingMapper;
     private final List<Table> extNavTables = ListUtil.list(true);
     private final List<Table> extNavTables = ListUtil.list(true);
+    private final EmailFieldMappingMapper fieldMappingMapper;
     private String reportName = null;
     private String reportName = null;
     private Table baseInfoTable = null;
     private Table baseInfoTable = null;
     private List<ValueLabelVO> fieldMapper = null;
     private List<ValueLabelVO> fieldMapper = null;
@@ -54,7 +54,7 @@ public class PDMonthlyReportParser extends AbstractReportParser<MonthlyReportNav
             List<String> textList = StrUtil.split(text, "\r\n");
             List<String> textList = StrUtil.split(text, "\r\n");
             if (CollUtil.isNotEmpty(textList)) {
             if (CollUtil.isNotEmpty(textList)) {
                 List<String> wkList = this.watermarkListMap.get("report_name");
                 List<String> wkList = this.watermarkListMap.get("report_name");
-                String name = this.processString(wkList, textList.get(0) + textList.get(1));
+                String name = this.processString(wkList, textList.get(0));
                 this.reportName = this.matchReportName(name);
                 this.reportName = this.matchReportName(name);
                 if (StrUtil.isBlank(this.reportName)) {
                 if (StrUtil.isBlank(this.reportName)) {
                     throw new APIException("未匹配到报告名称");
                     throw new APIException("未匹配到报告名称");

+ 4 - 1
service-daq/src/main/java/com/simuwang/daq/service/ReportParseService.java

@@ -12,6 +12,9 @@ public class ReportParseService {
     }
     }
 
 
     public void parse() {
     public void parse() {
-        this.parser.parse(1, "D:\\Documents\\workspace\\idea\\smppw\\data-daq\\service-daq\\src\\main\\java\\com\\simuwang\\daq\\utils\\2061834.pdf", "幻方量化1000指数专享1号5期私募证券投资基金宁波幻方量化投资管理合伙企业(有限合伙)");
+//        this.parser.parse(1, "D:\\Documents\\workspace\\idea\\smppw\\data-daq\\service-daq\\src\\main\\java\\com\\simuwang\\daq\\utils\\12931.pdf", "幻方量化1000指数专享1号5期私募证券投资基金宁波幻方量化投资管理合伙企业(有限合伙)");
+        this.parser.parse(1,
+                "D:\\Documents\\workspace\\idea\\smppw\\data-daq\\service-daq\\src\\main\\java\\com\\simuwang\\daq\\utils\\12931.pdf",
+                "古曲泉发一号私募证券投资基金上海古曲私募基金管理有限公司");
     }
     }
 }
 }