diff --git a/src/main/java/com/budwk/app/sys/controller/SysLoginController.java b/src/main/java/com/budwk/app/sys/controller/SysLoginController.java index 02e654f0..5dee8b02 100644 --- a/src/main/java/com/budwk/app/sys/controller/SysLoginController.java +++ b/src/main/java/com/budwk/app/sys/controller/SysLoginController.java @@ -68,7 +68,7 @@ public class SysLoginController { @Ok("re") @ApiOperation("用户本地登录页面") @Filters -// @SaCheckLogin + @SaCheckLogin public String login(HttpServletRequest req, HttpSession session) { return "beetl:/platform/sys/login.html"; } @@ -76,7 +76,7 @@ public class SysLoginController { @At @Ok("re") @Filters -// @SaCheckLogin + @SaCheckLogin public String h5() { return "beetl:/platform/sys/login.html"; } @@ -92,7 +92,7 @@ public class SysLoginController { @At("/doLogin") @Ok("json") @ApiOperation("用户本地账号密码登录") -// @SaCheckLogin + @SaCheckLogin public Object doLogin(@Param("username") String username, @Param("password") String password, @Param("platformKey") String captchaKey, diff --git a/src/main/java/com/budwk/app/sys/controller/SysUnitController.java b/src/main/java/com/budwk/app/sys/controller/SysUnitController.java index f17e93c0..aed4ab8a 100644 --- a/src/main/java/com/budwk/app/sys/controller/SysUnitController.java +++ b/src/main/java/com/budwk/app/sys/controller/SysUnitController.java @@ -48,8 +48,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -; - /** * Created by wizzer on 2016/6/24. */ @@ -300,7 +298,7 @@ public class SysUnitController { ) )); } - List> treeList = TreeUtil.build(nodeList, StrUtil.blankToDefault(pid, "0000")); + List> treeList = TreeUtil.build(nodeList, StrUtil.blankToDefault(pid, "0")); // NutMap menuMap = NutMap.NEW(); // for (Sys_unit unit : list) { diff --git a/src/main/java/com/budwk/app/sys/services/impl/SysDataUserAllUpdateServiceImpl.java b/src/main/java/com/budwk/app/sys/services/impl/SysDataUserAllUpdateServiceImpl.java index 3ee53ac3..d97ae8eb 100644 --- a/src/main/java/com/budwk/app/sys/services/impl/SysDataUserAllUpdateServiceImpl.java +++ b/src/main/java/com/budwk/app/sys/services/impl/SysDataUserAllUpdateServiceImpl.java @@ -22,6 +22,7 @@ import com.budwk.app.sys.services.SysUserService; import com.budwk.app.zhgh.democratic.proposal.models.ProposalConfig; import com.budwk.app.zhgh.staffmanage.member.constant.MemberChangeOrigin; import com.budwk.app.zhgh.staffmanage.member.constant.MemberChangeType; +import com.budwk.app.zhgh.staffmanage.specialstaff.model.SpecialStaff; import lombok.extern.slf4j.Slf4j; import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.Chain; @@ -174,6 +175,10 @@ public class SysDataUserAllUpdateServiceImpl implements SysDataUserUpdateService List sysUsers = dao.query(Sys_user.class, Cnd.NEW().groupBy("loginname")); Map userMap = sysUsers.stream().collect(Collectors.toMap(Sys_user::getLoginname, sysUser -> sysUser)); + // 特殊人员，忽略更新 + List specialStaffList = dao.query(SpecialStaff.class, Cnd.NEW()).stream().map(SpecialStaff::getUserId).toList(); + + // 准备数据集合 List needDoUpdateList = new CopyOnWriteArrayList<>(); List needInitUserList = new CopyOnWriteArrayList<>(); @@ -183,6 +188,7 @@ public class SysDataUserAllUpdateServiceImpl implements SysDataUserUpdateService // 处理每条数据 for (Sys_user_source source : sources) { + Sys_user user = userMap.get(source.getLoginname()); // 创建用户对象 @@ -203,6 +209,11 @@ public class SysDataUserAllUpdateServiceImpl implements SysDataUserUpdateService // } needInitUserList.add(u); } else { + + if (specialStaffList.contains(u.getId())) { + continue; + } + // 修改现有用户 u.setId(user.getId()); diff --git a/src/main/java/com/budwk/app/sys/services/impl/SysUserServiceImpl.java b/src/main/java/com/budwk/app/sys/services/impl/SysUserServiceImpl.java index 83bb38d7..7b4a6887 100644 --- a/src/main/java/com/budwk/app/sys/services/impl/SysUserServiceImpl.java +++ b/src/main/java/com/budwk/app/sys/services/impl/SysUserServiceImpl.java @@ -308,7 +308,7 @@ public class SysUserServiceImpl extends BaseServiceImpl implements Sys String decodePwd = Base64Decoder.decodeStr(passowrd); String hashedPassword = PwdUtil.getPassword(decodePwd, user.getSalt()); if (!Strings.sNull(hashedPassword).equalsIgnoreCase(user.getPassword())) { -// throw new BaseException("用户名或者密码不正确"); + throw new BaseException("用户名或者密码不正确"); } user = this.fetchLinks(user, "unit"); if (Lang.isNotEmpty(user.getUnit()) && StrUtil.isNotBlank(user.getUnit().getUnionId())) { diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/specialstaff/controller/SpecialStaffManageController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/specialstaff/controller/SpecialStaffManageController.java index 97da8c74..57509567 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/specialstaff/controller/SpecialStaffManageController.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/specialstaff/controller/SpecialStaffManageController.java @@ -109,19 +109,16 @@ public class SpecialStaffManageController { BeanUtil.copyProperties(specialStaffVo, staff); if (specialStaffVo.getIsManyUnit()!=null && specialStaffVo.getIsManyUnit()) { // 如果是多单位人员, 更改单位为工会关系 - user.setUnitId(specialStaffVo.getUnionRelationUnitId()); -// user.setThreeUnitId(specialStaffVo.getUnionRelationThreeUnitId()); -// user.setIsManyUnit(true); - dao.updateIgnoreNull(user); + dao.update( + Sys_user.class, + Chain.make("unitId", specialStaffVo.getUnionRelationUnitId()), + Cnd.where(Sys_user::getId, "=", user.getId()) + ); staff.setPersonnelRelationUnitId(viewUser.getUnitId()); staff.setPersonnelRelationUnitName(viewUser.getUnitName()); staff.setPersonnelRelationUnionId(viewUser.getUnionId()); staff.setPersonnelRelationUnionName(viewUser.getUnionName()); -// staff.setPersonnelRelationThreeUnitId(viewUser.getThreeUnitId()); -// staff.setPersonnelRelationThreeUnitName(viewUser.getThreeUnitName()); -// staff.setPersonnelRelationUnionGroupId(viewUser.getUnionGroupId()); -// staff.setPersonnelRelationUnionGroupName(viewUser.getUnionGroupName()); } staff.setUserId(user.getId()); dao.insertOrUpdate(staff); diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/specialstaff/service/impl/SpecialStaffManageServiceImpl.java b/src/main/java/com/budwk/app/zhgh/staffmanage/specialstaff/service/impl/SpecialStaffManageServiceImpl.java index d8fb2c7c..a1190985 100644 --- a/src/main/java/com/budwk/app/zhgh/staffmanage/specialstaff/service/impl/SpecialStaffManageServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/staffmanage/specialstaff/service/impl/SpecialStaffManageServiceImpl.java @@ -72,7 +72,6 @@ public class SpecialStaffManageServiceImpl extends BaseServiceImpl cnd.andEX("u.unionId", "=", pageForm.getUnionId()); cnd.andEX("u.unitId", "=", pageForm.getUnitId()); - cnd.andEX("u.personType", "=", pageForm.getPersonType()); cnd.andEX("u.userState", "=", pageForm.getUserState()); cnd.andEX("u.personType", "=", pageForm.getPersonType()); cnd.andEX("s.specialStaffType", "=", pageForm.getSpecialStaffType()); diff --git a/src/main/resources/views/platform/sys/unit/index.html b/src/main/resources/views/platform/sys/unit/index.html index b1bc6e4b..d7c4dfd4 100644 --- a/src/main/resources/views/platform/sys/unit/index.html +++ b/src/main/resources/views/platform/sys/unit/index.html @@ -1,34 +1,101 @@ - +
- - - + + +
diff --git a/src/main/resources/views/platform/sys/unit/unitManage.js b/src/main/resources/views/platform/sys/unit/unitManage.js index bd78b439..61f63909 100644 --- a/src/main/resources/views/platform/sys/unit/unitManage.js +++ b/src/main/resources/views/platform/sys/unit/unitManage.js @@ -1,5 +1,5 @@ const UNIT_MANAGE_TEMPLATE = { - template: ` + template: /*language=HTML*/ `
@@ -30,27 +30,37 @@ const UNIT_MANAGE_TEMPLATE = { - - - - + + + + - + + + + + + + + + + @@ -88,6 +98,7 @@ const UNIT_MANAGE_TEMPLATE = { required: true } }, + store, data() { return { pageForm: { @@ -107,7 +118,7 @@ const UNIT_MANAGE_TEMPLATE = { formRules: { name: [{ required: true, message: "必填", trigger: "blur" }], unitcode: [{ required: true, message: "必填", trigger: "blur" }], - unitLevel: [{ required: true, message: "必填", trigger: "blur" }], + unitLevel: [{ required: false, message: "必填", trigger: "blur" }], email: [ { required: false, message: "单位邮箱", trigger: "blur" }, { type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] } @@ -115,24 +126,8 @@ const UNIT_MANAGE_TEMPLATE = { }, options: [], parentUnit: [], - props: { - lazy: true, - checkStrictly: true, - multiple: false, - lazyLoad: function (node, resolve) { - var url = base + "/platform/sys/unit/cascaderData" - $.post( - url, - { pid: node.value }, - function (data) { - if (data.code === 0) { - resolve(data.data) - } - }, - "json" - ) - } - } + + unions: [], } }, computed: {}, @@ -148,26 +143,29 @@ const UNIT_MANAGE_TEMPLATE = { this.options = [] }, doHandle() { - const self = this - const url = this.formData.id ? "/platform/sys/unit/editDo" : "/platform/sys/unit/addDo" - this.$refs["form"].validate(async function (valid) { - if (valid) { - if (!self.formData.id) { - self.formData.parentId = self.parentUnit[self.parentUnit.length - 1] || "" + this.$confirm("确定要提交吗？", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning" + }).then(() => { + const self = this + const url = this.formData.id ? "/platform/sys/unit/editDo" : "/platform/sys/unit/addDo" + this.$refs["form"].validate(async function (valid) { + if (valid) { + if (self.currentNode) { + self.formData.parentId = self.currentData.id + } + const resp = await self.$axios.post(url, self.formData) + if (resp.code === 0) { + self.$message.success(resp.msg) + self.doSearch() + self.dialogVisible = false + self.$emit("refresh", null) + } else { + self.$message.warning(resp.msg) + } } - if (self.currentNode !== 1) { - self.formData.parentId = self.currentData.id - } - const resp = await self.$axios.post(url, self.formData) - if (resp.code === 0) { - self.$message.success(resp.msg) - self.doSearch() - self.dialogVisible = false - self.$emit("refresh", null) - } else { - self.$message.warning(resp.msg) - } - } + }) }) }, async openEdit(id) { @@ -216,7 +214,13 @@ const UNIT_MANAGE_TEMPLATE = { }) } }, - created() { + async created() { this.pageData() + + if (this.$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')) { + this.unions = await this.$businessTool.listUnion() + } else { + this.unions = await this.$businessTool.listUnion(this.store.state.user.union.id) + } } } diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/common/info/memberInfo.js b/src/main/resources/views/platform/zhgh/staffmanage/member/common/info/memberInfo.js index 98edb763..4313c4c9 100644 --- a/src/main/resources/views/platform/zhgh/staffmanage/member/common/info/memberInfo.js +++ b/src/main/resources/views/platform/zhgh/staffmanage/member/common/info/memberInfo.js @@ -16,7 +16,7 @@ {{ viewData.idCardType }} - {{ viewData.idcard }} + {{ viewData.idCard }} {{ viewData.mobile }} @@ -39,7 +39,7 @@