Merge remote-tracking branch 'origin/main'

src/main/java/com/budwk/app/sys/controller/SysUnionController.java

@@ -291,6 +291,7 @@ public class SysUnionController {
                     LEFT JOIN wf_process_task t ON t.processInstanceId = ins.id AND t.taskState = 10
                     LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id
                 $condition
+                $constructionSql
                 """);
 
 		Cnd cnd = Cnd.where("role.`code`", "in", branchUnionRoleCodes);
@@ -302,7 +303,9 @@ public class SysUnionController {
 				case "roleName" -> cnd.where().andLike("role.`name`", pageForm.getSearchKeyword());
 			}
 		}
-        cnd.and(new Static("1=1 order by field(role.code," + branchUnionRoleCodes.stream().map(code -> "'" + code + "'").collect(Collectors.joining(",")) + ")"));
+		sql.setVar("constructionSql",
+				new Static(" group by info.id order by field(role.code," + branchUnionRoleCodes.stream().map(code -> "'" + code + "'").collect(Collectors.joining(",")) + ")")
+		);
 		sql.setCondition(cnd);
 		List<NutMap> list = sysUserService.listMap(sql);
 		return Result.success(list);
@@ -453,7 +456,7 @@ public class SysUnionController {
 	@ApiOperation("按关键字查询分工会下的人员")
 	@Ok("json:{ignoreNull:true}")
 	@SaCheckPermission("sys.manager.union")
-    public Result listUserSelect(@Valid String unionId, @Valid String keyWord) {
+	public Result listUnion(@Valid String unionId, @Valid String keyWord) {
 		Sql sql = Sqls.create("select id,loginname,username,unitName from vw_user $condition");
 		Cnd cnd = Cnd.NEW();
 		cnd.and(View_user::getUnionId, "=", unionId);

src/main/resources/views/platform/sys/union/branchUnionCommitteeMemberManage.js

@@ -92,8 +92,7 @@ const branchUnionCommitteeMemberManage = {
                 sessionId: [{required: true, message: "必填", trigger: ["change", "blur"]}],
                 userId: [{required: true, message: "必填", trigger: ["change", "blur"]}],
             },
-            sessionOptions: [],
+            sessionOptions: []
-            pageDataUrl:"/platform/sys/committeeMember/pageData"
         }
     },
     methods: {
@@ -108,6 +107,12 @@ const branchUnionCommitteeMemberManage = {
                 }
             })
         },
+        pageData() {
+            $.get("/platform/sys/committeeMember/pageData", this.pageForm).then((res) => {
+                this.tableData = res.data.list
+                this.pageForm.totalCount = res.data.totalCount
+            })
+        },
         openAdd() {
             this.dialogFormVisible = true
             this.$nextTick(() => {
@@ -119,7 +124,7 @@ const branchUnionCommitteeMemberManage = {
                 if (!valid) return
                 const session = this.sessionOptions.find(item => item.id === this.formData.sessionId)
                 this.formData.sessionName = session.fullName
-                this.$axios.post("/platform/sys/committeeMember/insert", this.formData).then((res) => {
+                $.post("/platform/sys/committeeMember/insert", this.formData).then((res) => {
                     this.dialogFormVisible = false
                     this.$message.success(res.msg)
                     this.pageData()
@@ -132,7 +137,7 @@ const branchUnionCommitteeMemberManage = {
                 cancelButtonText: "取消",
                 type: "info"
             }).then(() => {
-                this.$axios.post("/platform/sys/committeeMember/delete", {id}).then((res) => {
+                $.post("/platform/sys/committeeMember/delete", {id}).then((res) => {
                     this.$message.success(res.msg)
                     this.pageData()
                 })
@@ -144,7 +149,7 @@ const branchUnionCommitteeMemberManage = {
                 cancelButtonText: "取消",
                 type: "info"
             }).then(() => {
-                this.$axios.post("/platform/sys/committeeMember/deleteRole", {sessionId:this.pageForm.sessionId}).then((res) => {
+                $.post("/platform/sys/committeeMember/deleteRole", {sessionId:this.pageForm.sessionId}).then((res) => {
                     this.$message.success(res.msg)
                     this.pageData()
                 })

src/main/resources/views/platform/sys/union/branchUnionUserManage.js

@@ -51,7 +51,7 @@ const branchUnionUserManage = {
                             <user-select
                                 v-model="formData.userId"
                                 style="width: 100%"
-                                api="/platform/sys/union/listUserSelect"
+                                api="/platform/sys/union/listUnion"
                                 :api_params="{ unionId: union_id }"
                                 :option_label_func="
                                     (item) => {