1

src/main/java/com/fdkankan/fusion/controller/TestController.java

@@ -142,7 +142,7 @@ public class TestController {
         BeanUtils.copyProperties(caseInquest,vo);
 
 
-        String info = "证人或当事人（签名）：%s  %s年 %s月 %s日身份证件号码：%s\n"
+        String info = "证人或当事人（签名）：%s  %s年 %s月 %s日 身份证件号码：%s\n"
                 +"   单位或住址：%s\n";
         StringBuilder msg = new StringBuilder();
         for (Object object : vo.getWitnessInfo()) {

src/main/java/com/fdkankan/fusion/request/CaseImgParam.java

@@ -9,7 +9,6 @@ import java.util.List;
 public class CaseImgParam extends RequestBase {
     private Integer caseId;
     private Integer status;
-    private String  orderBy;
 
     private Integer id;
     private Integer sort;

src/main/java/com/fdkankan/fusion/service/impl/CaseImgServiceImpl.java

@@ -35,11 +35,7 @@ public class CaseImgServiceImpl extends ServiceImpl<ICaseImgMapper, CaseImg> imp
         if(param.getStatus() != null){
             wrapper.eq(CaseImg::getStatus,param.getStatus());
         }
-        if(StringUtils.isNotBlank(param.getOrderBy()) && param.getOrderBy().contains("sort")){
-            wrapper.apply(" order by " + param.getOrderBy());
-        }else {
-           wrapper.orderByDesc(CaseImg::getId);
-        }
+        wrapper.orderByDesc(CaseImg::getSort);
         return this.list(wrapper);
     }
 

src/main/java/com/fdkankan/fusion/service/impl/DataService.java

@@ -217,6 +217,9 @@ public class DataService implements IDataService {
             countMap.put(key,0L);
         }
         for (DataGroupVo dataGroupVo : groupVoList) {
+            if(dataGroupVo.getGroupKey() == null){
+                continue;
+            }
             String key = dataGroupVo.getGroupKey().split(">")[0];
             countMap.merge(key, dataGroupVo.getDataCount(), Long::sum);
         }