From 179c4d64313c9b7572778da4aaaf6c6584fe457d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 20 五月 2025 23:48:08 +0800
Subject: [PATCH] 修改文件上传类型限制

---
 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbServiceTeamServiceImpl.java |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbServiceTeamServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbServiceTeamServiceImpl.java
index 9976536..c053335 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbServiceTeamServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbServiceTeamServiceImpl.java
@@ -54,7 +54,7 @@
         ComPbServiceTeamDO comPbServiceTeamDO = new ComPbServiceTeamDO();
         BeanUtils.copyProperties(comPbServiceTeamDTO, comPbServiceTeamDO);
         comPbServiceTeamDO.setIsReg(2);
-        Long userId = comPbMemberRoleDAO.getSysUserIdByPhone(comPbServiceTeamDTO.getPhone());
+        Long userId = comPbMemberRoleDAO.getSysUserIdByPhone(comPbServiceTeamDTO.getPhone(), comPbServiceTeamDTO.getAppid());
         if (nonNull(userId)) {
             comPbServiceTeamDO.setIsReg(1);
         }
@@ -84,9 +84,9 @@
         ComPbServiceTeamDO oldComPbServiceTeam =
             comPbServiceTeamDAO.selectComPbServiceTeamById(comPbServiceTeamDTO.getId());
         String oldphone = oldComPbServiceTeam.getPhone();
-        SysUserVO sysUserOld = comPbMemberRoleDAO.getSysUserByPhone(oldphone);
+        SysUserVO sysUserOld = comPbMemberRoleDAO.getSysUserByPhone(oldphone, comPbServiceTeamDTO.getAppid());
         String newphone = comPbServiceTeamDTO.getPhone();
-        SysUserVO sysUserNew = comPbMemberRoleDAO.getSysUserByPhone(newphone);
+        SysUserVO sysUserNew = comPbMemberRoleDAO.getSysUserByPhone(newphone, comPbServiceTeamDTO.getAppid());
         if (!ObjectUtils.isEmpty(sysUserOld) || !ObjectUtils.isEmpty(sysUserNew)) {
             comPbServiceTeamDO.setIsReg(1);
         }
@@ -118,6 +118,9 @@
         page.setSize(pageSize);
         page.setCurrent(pageNum);
         IPage<ComPbServiceTeamVO> iPage = comPbServiceTeamDAO.PageComPbServiceTeamDTO(page, pageComPbServiceTeamDTO);
+        if (nonNull(pageComPbServiceTeamDTO.getPropertyId())){
+            iPage = comPbServiceTeamDAO.pageServiceTeamProperty(page, pageComPbServiceTeamDTO);
+        }
         return R.ok(iPage);
     }
 
@@ -138,7 +141,7 @@
         int delete = comPbServiceTeamDAO.deleteById(comPbServiceTeamDTO.getId());
         if (delete > 0) {
 
-            SysUserVO sysUserVO = comPbMemberRoleDAO.getSysUserByPhone(comPbServiceTeamDO.getPhone());
+            SysUserVO sysUserVO = comPbMemberRoleDAO.getSysUserByPhone(comPbServiceTeamDO.getPhone(), comPbServiceTeamDTO.getAppid());
             // 删除用户信息缓存
             if (sysUserVO != null) {
                 Long userId = sysUserVO.getUserId();
@@ -156,4 +159,9 @@
         List<ComPbServiceTeamVO> comPbServiceTeamVOS = comPbServiceTeamDAO.getTotlePerson(param, communityId);
         return R.ok(comPbServiceTeamVOS);
     }
+
+    @Override
+    public R getComPbServiceTeamData(String communityId, String phone) {
+        return R.ok(comPbServiceTeamDAO.getComPbServiceTeamData(communityId,phone));
+    }
 }

--
Gitblit v1.7.1