From 786deefd0e3c99a2042a024d3b60a02b0effc356 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 27 六月 2024 10:09:41 +0800
Subject: [PATCH] 花城 修改单位管理员逻辑
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbCheckUnitMapper.xml | 7 +++++++
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java | 7 +++++++
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbCheckUnitMapper.java | 13 +++++++++++++
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbCheckUnitServiceImpl.java | 9 +++++++++
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 7 ++++---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/UserDao.xml | 5 +++++
6 files changed, 45 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbCheckUnitMapper.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbCheckUnitMapper.java
index d7b04f8..d6c0307 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbCheckUnitMapper.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbCheckUnitMapper.java
@@ -105,5 +105,18 @@
Integer organSumIntegral(@Param("communityIds") List<Long> communityIds,@Param("yearTime") String yearTime);
Integer pbOrganSumIntegral(@Param("communityIds") List<Long> communityIds,@Param("yearTime") String yearTime);
+
+
+
+
+ /**
+ * 查询单位管理员
+ *
+ * @param phone
+ * @return
+ */
+ Integer selectOrgAdmin(@Param("phone") String phone);
+
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbCheckUnitServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbCheckUnitServiceImpl.java
index e562c81..f2e355a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbCheckUnitServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbCheckUnitServiceImpl.java
@@ -128,6 +128,15 @@
Long communityId=this.baseMapper.selectCommunityId(comPbCheckUnit.getHelpCommunityName().split(",")[0],comPbCheckUnit.getHelpCommunityName().split(",")[1],comPbCheckUnit.getHelpCommunityName().split(",")[2]);
ComPbCheckUnit entity = new ComPbCheckUnit();
BeanUtils.copyProperties(comPbCheckUnit, entity);
+ int a=0;
+ if(!StringUtils.isEmpty(comPbCheckUnit.getAdminPhone()))
+ {
+ a=this.baseMapper.selectOrgAdmin(comPbCheckUnit.getAdminPhone());
+ }
+ if(a!=0)
+ {
+ return R.fail("该手机号已绑定管理员!");
+ }
if(communityId!=null){
entity.setCommunityId(communityId);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbCheckUnitMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbCheckUnitMapper.xml
index a30be51..fae1770 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbCheckUnitMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbCheckUnitMapper.xml
@@ -508,5 +508,12 @@
</select>
+
+ <select id="selectOrgAdmin" resultType="Integer">
+ select count(*) from com_pb_check_unit where admin_phone like concat('%',#{phone},'%')
+ </select>
+
+
+
</mapper>
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
index 999487c..c2bd855 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
@@ -328,6 +328,13 @@
Integer selectOrgAdmin(@Param("phone") String phone);
/**
+ * 查询绑定单位id
+ * @param phone
+ * @return
+ */
+ Long selectOrgAdminId(@Param("phone") String phone);
+
+ /**
* 查询报道单位id
*
* @param phone
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
index 44a82a9..e38f693 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -480,12 +480,13 @@
loginUserInfoVO.setIsCheckUnitAdmin(0);
}
Long checkUnitId=userDao.selectCheckUnitId(phone);
+ Long AdminUnitId=userDao.selectOrgAdminId(phone);
if(checkUnitId!=null){
loginUserInfoVO.setCheckUnitId(checkUnitId);
}
-// else {
-// loginUserInfoVO.setIsCheckUnitAdmin(0);
-// }
+ if (AdminUnitId!=null){
+ loginUserInfoVO.setBindingCheckUnitId(AdminUnitId);
+ }
//是否网格员
int easyPhotoMember = userDao.countEasyPhotoMember(phone, userCommunityId);
if (easyPhotoMember > 0) {
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/UserDao.xml b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/UserDao.xml
index 94860f6..982fe9f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/UserDao.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/UserDao.xml
@@ -602,6 +602,11 @@
<select id="selectOrgAdmin" resultType="Integer">
select count(*) from com_pb_check_unit where admin_phone like concat('%',#{phone},'%')
</select>
+
+ <select id="selectOrgAdminId" resultType="Long">
+ select id from com_pb_check_unit where admin_phone like concat('%',#{phone},'%')
+ </select>
+
<select id="selectCheckUnitId" resultType="Long">
select check_unit_id from com_pb_member where phone = #{phone} limit 1
</select>
--
Gitblit v1.7.1