diff --git a/src/main/java/io/v/nutz/sys/models/User.java b/src/main/java/io/v/nutz/sys/models/User.java index 7f274ea..53ceb6f 100644 --- a/src/main/java/io/v/nutz/sys/models/User.java +++ b/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; + } diff --git a/src/main/java/io/v/nutz/web/commons/controller/ViCommonCon.java b/src/main/java/io/v/nutz/web/commons/controller/ViCommonCon.java index 84ad6e1..da22258 100644 --- a/src/main/java/io/v/nutz/web/commons/controller/ViCommonCon.java +++ b/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()); } diff --git a/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/apply/MemberApplyBranchUnionAuditController.java b/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/apply/MemberApplyBranchUnionAuditController.java index 61aa63e..4b24fb2 100644 --- a/src/main/java/io/v/nutz/zhgh/staffmanage/member/controller/apply/MemberApplyBranchUnionAuditController.java +++ b/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); diff --git a/src/main/java/io/v/nutz/zhgh/staffmanage/member/service/impl/MemberCommonServiceImpl.java b/src/main/java/io/v/nutz/zhgh/staffmanage/member/service/impl/MemberCommonServiceImpl.java index 8677dec..fc8dd70 100644 --- a/src/main/java/io/v/nutz/zhgh/staffmanage/member/service/impl/MemberCommonServiceImpl.java +++ b/src/main/java/io/v/nutz/zhgh/staffmanage/member/service/impl/MemberCommonServiceImpl.java @@ -144,10 +144,8 @@ public class MemberCommonServiceImpl extends ViServiceImpl 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); diff --git a/src/main/resources/views/platform/member/apply/submit/index.html b/src/main/resources/views/platform/member/apply/submit/index.html index 1b102bc..caab6df 100644 --- a/src/main/resources/views/platform/member/apply/submit/index.html +++ b/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') diff --git a/src/main/resources/views/platform/member/change/manage/index.html b/src/main/resources/views/platform/member/change/manage/index.html index 682deba..951c635 100644 --- a/src/main/resources/views/platform/member/change/manage/index.html +++ b/src/main/resources/views/platform/member/change/manage/index.html @@ -212,11 +212,11 @@ layout("/layouts/platform.html"){ 设置校区 --> - - - - - + + 单位调整 + 添加非库内人员 @@ -226,7 +226,7 @@ layout("/layouts/platform.html"){ @sort-change="pageOrder" v-loading="tableLoading" :size="tableSize" class="vi-table" @selection-change="tableHandleSelectionChange"> - + 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]