server_commit

src/main/java/io/v/nutz/sys/models/User.java

@@ -136,4 +136,7 @@ public class User {
     @Column
     private String threeUnitId;
 
+    @Column
+    private String cardNum;
+
 }

src/main/java/io/v/nutz/web/commons/controller/ViCommonCon.java

@@ -501,7 +501,7 @@ public class ViCommonCon {
         if (ShiroUtil.hasAnyRoles("sysadmin,SchoolUnionAdmin")) {
 
         } else if (ShiroUtil.hasRole("H04")) {
-            cnd.and("unionid", "=", Vi.getUnionId());
+//            cnd.and("unionid", "=", Vi.getUnionId());
         } else if (ShiroUtil.hasRole("ghxzzz")) {
             cnd.and("id", "=", Vi.getUnit().getId());
         }

src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/apply/MemberApplyBranchUnionAuditController.java

@@ -91,7 +91,7 @@ public class MemberApplyBranchUnionAuditController {
         Cnd cnd = Cnd.NEW();
         pageForm.buildSearch(cnd, "record.");
         if (!ShiroUtil.hasAnyRoles("sysadmin, A06, SchoolUnionMemberAdmin")) {
-            cnd.and("record.allocationUnionId", "=", Vi.getUnionId());
+            cnd.and("record.unionId", "=", Vi.getUnionId());
         }
         if (pageForm.getAudit()) {
             cnd.and("record.applyStateId", ">", 20);

src/main/java/io/v/nutz/zhgh/staffmanage/member/service/impl/MemberCommonServiceImpl.java

@@ -144,10 +144,8 @@ public class MemberCommonServiceImpl extends ViServiceImpl<Sys_user> implements
         if ("school".equals(queryType)) {
             cnd.and("role.`code`", "=", "SchoolUnionMemberAdmin");
         } else {
-            Sql sqlUnionId = Sqls.fetchString(Sqls.create("select unionid from `user` where id = @id").setParam("id", userId).toString());
-            dao().execute(sqlUnionId);
-            String unionid = sql.getString();
-            cnd.and("u.unionid", "=",unionid);
+            User user = dao().fetch(User.class, Cnd.where("id", "=", userId));
+            cnd.and("u.unionid", "=", user.getUnionid());
             cnd.and("role.`code`", "=", "BranchUnionMemberAdmin");
         }
         sql.setCondition(cnd);

src/main/resources/views/platform/member/apply/submit/index.html

@@ -349,7 +349,7 @@ layout("/layouts/platform.html"){
 		        window.open("/platform/member/apply/mine/doExportProve")
 	        },
             async validateApply() {
-                if (this.formData.id) {
+                if (this.id) {
                     return
                 }
                 const resp = await $.post('/platform/member/apply/submit/validateApply')

src/main/resources/views/platform/member/change/manage/index.html

@@ -212,11 +212,11 @@ layout("/layouts/platform.html"){
                                设置校区
                            </el-button>-->
 
-                        <!--                        <el-button :disabled="!checkUsers.length" type="primary" size="small"-->
-                        <!--                                   icon="el-icon-edit"-->
-                        <!--                                   @click="openUnitMove" class="ml5">-->
-                        <!--                            单位调整-->
-                        <!--                        </el-button>-->
+                        <el-button :disabled="!checkUsers.length" type="primary" size="small"
+                                   icon="el-icon-edit"
+                                   @click="openUnitMove" class="ml5">
+                            单位调整
+                        </el-button>
 
 	                    <el-button type="primary" size="small" @click="openAddUser">添加非库内人员</el-button>
                     </template>
@@ -226,7 +226,7 @@ layout("/layouts/platform.html"){
                           @sort-change="pageOrder"
                           v-loading="tableLoading" :size="tableSize" class="vi-table"
                           @selection-change="tableHandleSelectionChange">
-                    <!--                    <el-table-column type="selection" :reserve-selection="true"></el-table-column>-->
+                    <el-table-column type="selection" :reserve-selection="true"></el-table-column>
 
                     <el-table-column align="center" header-align="center" type="index"
                                      :index="indexMethod" label="序号"
@@ -782,15 +782,18 @@ layout("/layouts/platform.html"){
                     userId: this.checkUsers.map(v => v.id)
                 }
 
-                const resp = await $.post(loc() + '/userUnitMove', params)
-                if (resp.code === 0) {
-                    this.pageData()
-                    this.getNumData()
-                    this.$refs.table.clearSelection();
-                    this.unitMoveVisibile = false
-                } else {
-                    this.notifyWarning(resp.msg)
-                }
+                this.$confirm('请您再次核对调整后单位是否准确，确认要调整吗？')
+                    .then(async () => {
+                        const resp = await $.post(loc() + '/userUnitMove', params)
+                        if (resp.code === 0) {
+                            this.pageData()
+                            this.getNumData()
+                            this.$refs.table.clearSelection();
+                            this.unitMoveVisibile = false
+                        } else {
+                            this.notifyWarning(resp.msg)
+                        }
+                    })
             },
             changeDateRangeChange(val) {
                 this.pageForm.changeDateBefore = val[0]