From 1e779629fc4257df807a48280f3fc23eae752653 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 23 五月 2024 16:11:16 +0800
Subject: [PATCH] bug修复
---
meiya-rest/src/main/java/com/sinata/rest/modular/member/controller/UserController.java | 8 ++++++--
1 files changed, 6 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..77b8ad2 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,12 @@
vo.setIdCard(user.getIdCard());
vo.setImAccount(user.getImAccount());
vo.setImPassword(user.getImPassword());
- if (user.getIsLeaveOffice() != -1 && user.getAuditState() != 2) {
- vo.setModifyUserInfo(false);
+ //在职
+ boolean condition1 = user.getIsLeaveOffice() == 0 && user.getAuditState() == 1;
+ //已提交申请
+ boolean condition2 = user.getIsLeaveOffice() == 1 && user.getAuditState() == 0;
+ if (condition1 || condition2) {
+ vo.setModifyUserInfo(true);
}
return vo;
}
--
Gitblit v1.7.1