diff --git a/yanzhu-bigscreen/src/views/safety/powerIot.vue b/yanzhu-bigscreen/src/views/safety/powerIot.vue
index b6fbb3b4..40a3b0cf 100644
--- a/yanzhu-bigscreen/src/views/safety/powerIot.vue
+++ b/yanzhu-bigscreen/src/views/safety/powerIot.vue
@@ -138,7 +138,7 @@
diff --git a/yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/enums/IsDelEnums.java b/yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/enums/IsDelEnums.java
index 8bbbf8b1..52bd6cfb 100644
--- a/yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/enums/IsDelEnums.java
+++ b/yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/enums/IsDelEnums.java
@@ -8,7 +8,8 @@ package com.yanzhu.common.core.enums;
public enum IsDelEnums {
NO(0L, "0","有效"),
- YES(1L, "1", "删除");
+ YES(1L, "1", "无效"),
+ DEL(2L, "2", "删除");
private final Long code;
private final String codeStr;
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsServiceImpl.java
index f9d2638a..c0c76315 100644
--- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsServiceImpl.java
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsServiceImpl.java
@@ -250,10 +250,22 @@ public class ProProjectInfoSubdeptsServiceImpl implements IProProjectInfoSubdept
}
proProjectInfoSubdepts.setComId(info.getComId());
if(Objects.equals(proProjectInfoSubdepts.getSubDeptType(), SubDeptsEnums.ZYFB.getCode()) || Objects.equals(proProjectInfoSubdepts.getSubDeptType(),SubDeptsEnums.LWFB.getCode())){
- Map map = proProjectInfoSubdeptsUsersMapper.findProUserPhone(info.getId(),proProjectInfoSubdepts.getSubDeptLeaderPhone());
- if(Objects.nonNull(map) && Convert.toInt(map.get("total"),0)>0){
- throw new ServiceException("手机号码已存在");
+ // 查询用户是否已申请
+ ProProjectInfoSubdeptsUsers usersQuery = new ProProjectInfoSubdeptsUsers();
+ usersQuery.setProjectId(info.getId());
+ usersQuery.setUserPhone(proProjectInfoSubdepts.getSubDeptLeaderPhone());
+ List users = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersList(usersQuery);
+ if(users.size()>0){
+ ProProjectInfoSubdeptsUsers oldUserData = users.get(0);
+ if(oldUserData.getApproveStatus()==ApproveStatus.refuse.getCode()){
+ // 删除用户冗余数据...
+ oldUserData.setIsDel(IsDelEnums.DEL.getCode());
+ proProjectInfoSubdeptsUsersMapper.updateProProjectInfoSubdeptsUsers(oldUserData);
+ }else{
+ throw new ServiceException("手机号码已存在");
+ }
}
+
// 单位委托人信息
if(StringUtils.isNotEmpty(proProjectInfoSubdepts.getSubDeptLeaderName()) && StringUtils.isNotEmpty(proProjectInfoSubdepts.getSubDeptLeaderCode()) && StringUtils.isNotEmpty(proProjectInfoSubdepts.getSubDeptLeaderPhone())){
SysUser sysUser = new SysUser();
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java
index 63c8319a..e513ec59 100644
--- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java
@@ -349,9 +349,21 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu
if(Objects.isNull(parUsers)){
throw new ServiceException("用户信息异常...请重新扫码");
}
- Map map = proProjectInfoSubdeptsUsersMapper.findProUserPhone(parUsers.getProjectId(),proProjectInfoSubdeptsUsers.getUserPhone());
- if(Objects.nonNull(map) && Convert.toInt(map.get("total"),0)>0){
- throw new ServiceException("手机号码已存在");
+
+ // 查询数据是否已申请
+ ProProjectInfoSubdeptsUsers usersQuery = new ProProjectInfoSubdeptsUsers();
+ usersQuery.setProjectId(parUsers.getProjectId());
+ usersQuery.setUserPhone(proProjectInfoSubdeptsUsers.getUserPhone());
+ List users = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersList(usersQuery);
+ if(users.size()>0){
+ ProProjectInfoSubdeptsUsers oldUserData = users.get(0);
+ if(oldUserData.getApproveStatus()==ApproveStatus.refuse.getCode()){
+ // 删除用户冗余数据...
+ oldUserData.setIsDel(IsDelEnums.DEL.getCode());
+ proProjectInfoSubdeptsUsersMapper.updateProProjectInfoSubdeptsUsers(oldUserData);
+ }else{
+ throw new ServiceException("手机号码已存在");
+ }
}
proProjectInfoSubdeptsUsers.setComId(parUsers.getComId());
proProjectInfoSubdeptsUsers.setProjectId(parUsers.getProjectId());
diff --git a/yanzhu-ui-app/miniprogram/pages/project_qr/index.js b/yanzhu-ui-app/miniprogram/pages/project_qr/index.js
index 9d907903..87cff34b 100644
--- a/yanzhu-ui-app/miniprogram/pages/project_qr/index.js
+++ b/yanzhu-ui-app/miniprogram/pages/project_qr/index.js
@@ -2065,12 +2065,15 @@ Page({
craftPost: null,
leaderDegreeGrade: null,
userInfos: {},
- degreeGrade: null
+ degreeGrade: null,
+ userPhone: this.data.userPhoneNumber,
+ subDeptLeaderPhone: this.data.userPhoneNumber
};
+ let _subDeptNameTemp = this.data.form.subDeptName;
this.setData({
form:_form,
active: 0,
- "parForm.subDeptName": this.data.form.subDeptName,
+ "parForm.subDeptName": _subDeptNameTemp
});
},