添加材料列表根据材料名称去重

base-manager/src/main/java/com/mortals/xhx/base/system/user/service/impl/UserServiceImpl.java

@@ -388,4 +388,15 @@ public class UserServiceImpl extends AbstractCRUDServiceImpl<UserDao, UserEntity
 //             }
 //         }).count();
     }
+
+    public static void main(String[] args) throws Exception {
+        //eba467f81fb265befdf1f6ab041d39ab   原始admin密码
+
+        System.out.println(SecurityUtil.md5DoubleEncoding("adminADMIN@123!@#"));
+
+
+        //宜宾一体化账号密码
+        System.out.println(SecurityUtil.md5DoubleEncoding("yibinYTH@123!@#"));
+    }
+
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/workman/model/vo/WorkmanVo.java

 package com.mortals.xhx.module.workman.model.vo;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.workman.model.WorkmanEntity;
+import com.mortals.xhx.module.workman.model.WorkmanQuery;
 import lombok.Data;
 import org.apache.poi.ss.usermodel.PictureData;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * 工作人员视图对象
  *
@@ -28,4 +34,24 @@ public class WorkmanVo extends BaseEntityLong {
 
     private String filePath;
 
+    /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
+    private List<WorkmanQuery> orConditionList;
+
+    /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+    private List<WorkmanQuery> andConditionList;
+
+    public static void main(String[] args) {
+        WorkmanEntity workmanEntity = new WorkmanEntity();
+
+        ArrayList<WorkmanQuery> andConditionList  = new ArrayList<>();
+        WorkmanQuery workmanQuery = new WorkmanQuery();
+        workmanQuery.setName("张三");
+        workmanQuery.setNumber("123");
+        andConditionList.add(workmanQuery);
+        workmanEntity.setAndConditionList(andConditionList);
+        System.out.println(JSON.toJSONString(workmanEntity));
+
+
+    }
+
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/workman/service/impl/WorkmanServiceImpl.java

@@ -264,9 +264,7 @@ public class WorkmanServiceImpl extends AbstractCRUDCacheServiceImpl<WorkmanDao,
         return successMsg.toString();
     }
 
-    public static void main(String[] args) throws Exception {
-        System.out.println(SecurityUtil.md5DoubleEncoding("adminADMIN123!@#"));
-    }
+
 
 
 }
\ No newline at end of file

base-manager/src/test/java/com/mortals/httpclient/workman/WorkmanController.http

@@ -14,7 +14,8 @@ Content-Type: application/json
 
 {
     "page":1,
-    "size":10
+    "size":10,
+    "andConditionList":[{"name":"%张三%","number":"%123%"}]
 }