commit

src/main/java/com/budwk/app/zhgh/staffmanage/sourcechange/controller/SourceChangeManageController.java

@@ -21,6 +21,7 @@ import org.nutz.dao.util.cri.SqlExpressionGroup;
 import org.nutz.dao.util.cri.Static;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.lang.Lang;
 import org.nutz.lang.util.NutMap;
 import org.nutz.mvc.annotation.At;
 import org.nutz.mvc.annotation.Ok;
@@ -97,10 +98,14 @@ public class SourceChangeManageController {
         cnd.andEX("his.preparedBy", "=", pageForm.getPreparedBy());
         cnd.andEX("his.userState", "=", pageForm.getUserState());
 //        cnd.andEX("his.changeType", "=", pageForm.getChangeType());
-        cnd.andEX("his.changeOrigin", "=", pageForm.getChangeOrigins());
+        cnd.andEX("his.changeOrigin", "=", pageForm.getChangeOrigin());
 
-        if (StrUtil.isNotBlank(pageForm.getChangeType())) {
-            cnd.and(new Static("JSON_CONTAINS(his.changeTypes, JSON_QUOTE('%s'), '$')".formatted(pageForm.getChangeType())));
+        if (Lang.isNotEmpty(pageForm.getChangeTypes())) {
+            SqlExpressionGroup seg = new SqlExpressionGroup();
+            for (String type : pageForm.getChangeTypes()) {
+                seg.or(new Static("JSON_CONTAINS(his.changeTypes, JSON_QUOTE('%s'), '$')".formatted(type)));
+            }
+            cnd.and(seg);
         }
 
         if (StrUtil.isAllNotBlank(pageForm.getChangeDateBefore(), pageForm.getChangeDateEnd())) {

src/main/java/com/budwk/app/zhgh/staffmanage/sourcechange/param/SourceChangePageForm.java

@@ -46,5 +46,5 @@ public class SourceChangePageForm extends PageForm {
     private String changeDateEnd;
 
     //变更来源
-    private List<Integer> changeOrigins;
+    private String changeOrigin;
 }