From 5dbf595f74ad662dd877cc8a6f140fdc61c3a1b5 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 24 五月 2024 14:50:05 +0800
Subject: [PATCH] bug修复
---
meiya-rest/src/main/java/com/sinata/rest/modular/member/controller/UserController.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/meiya-rest/src/main/java/com/sinata/rest/modular/member/controller/UserController.java b/meiya-rest/src/main/java/com/sinata/rest/modular/member/controller/UserController.java
index 4fc87fc..0c53358 100644
--- a/meiya-rest/src/main/java/com/sinata/rest/modular/member/controller/UserController.java
+++ b/meiya-rest/src/main/java/com/sinata/rest/modular/member/controller/UserController.java
@@ -369,8 +369,13 @@
vo.setIdCard(user.getIdCard());
vo.setImAccount(user.getImAccount());
vo.setImPassword(user.getImPassword());
- if (user.getIsLeaveOffice() != -1 && user.getAuditState() != 2) {
- vo.setModifyUserInfo(false);
+ vo.setIsLeaveOffice(user.getIsLeaveOffice());
+ //在职
+ boolean condition1 = user.getIsLeaveOffice() == 0 && user.getAuditState() == 1;
+ //已提交申请
+ boolean condition2 = user.getIsLeaveOffice() == 1 && user.getAuditState() == 0;
+ if (condition1 || condition2) {
+ vo.setModifyUserInfo(Boolean.FALSE);
}
return vo;
}
--
Gitblit v1.7.1