Browse Source

Merge branch 'test'

anderx 3 years ago
parent
commit
c09fc6a595

+ 3 - 3
src/main/java/com/goafanti/order/bo/InputSignStatistics.java

@@ -4,7 +4,7 @@ import java.util.List;
 
 public class InputSignStatistics {
 
-    private List<String> deps;
+    private String deps;
     private String aid;
     private String uid;
     private Integer amountType;
@@ -31,11 +31,11 @@ public class InputSignStatistics {
         this.orderType = orderType;
     }
 
-    public List<String> getDeps() {
+    public String getDeps() {
         return deps;
     }
 
-    public void setDeps(List<String> deps) {
+    public void setDeps(String deps) {
         this.deps = deps;
     }
 

+ 1 - 1
src/main/java/com/goafanti/order/service/impl/UserStatisticsServiceImpl.java

@@ -66,7 +66,7 @@ public class UserStatisticsServiceImpl extends BaseMybatisDao<UserMidMapper> imp
 
 	private void addsignStatisticsParam(InputSignStatistics in, Map<String, Object> map) {
 		if (!in.getDeps().isEmpty()){
-			map.put("deps",in.getDeps());
+			map.put("deps",departmentService.parseArray(in.getDeps()));
 		}
 		if (StringUtils.isNotBlank(in.getAid())) map.put("aid", in.getAid());
 		if (StringUtils.isNotBlank(in.getUid())) map.put("uid", in.getUid());