单位、加盟列表编辑bug修复

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/CooperationServiceImpl.java

@@ -254,19 +254,9 @@ public class CooperationServiceImpl implements CooperationService {
         if (!userApplyTag.getApplyStatus().equals(1)) {
             return ResultBody.error("当前服务商暂未通过审核！");
         }
-        // 编辑服务商信息
-        UserApplyTagDO userApplyTagDO = new UserApplyTagDO();
-        userApplyTagDO.setId(applyTagEditVO.getId());
-        userApplyTagDO.setRemark(applyTagEditVO.getRemark());
-        cooperationDao.updateUserApplyTag(userApplyTagDO);
-        userApplyTagDO.setAttachmentList(applyTagEditVO.getAttachmentList());
-        List<AttachmentVO> attachmentList = userApplyTagDO.getAttachmentList();
-
-        if (null != attachmentList) {
+        if (!CollectionUtils.isEmpty(applyTagEditVO.getAttachmentList())) {
             cooperationDao.deleteApplyResource(applyTagEditVO.getId());
-            if (attachmentList.size() != 0) {
-                cooperationDao.insertApplyResource(userApplyTagDO.getAttachmentList());
-            }
+            cooperationDao.insertApplyResource(applyTagEditVO.getAttachmentList());
         }
         // 修改单位网点位置信息
         CompanyInfoDO companyInfoDO = companyDao.getAppCompanyInfoUId(userApplyTag.getUserAccountId());

csm-service/cms-service-user/src/main/resources/mapper/CompanyDao.xml

@@ -185,7 +185,9 @@
     </select>
 
     <select id="listCompanyMembers" resultType="com.mmc.iuav.user.entity.CompanyMemberDO">
-        select id,user_account_id,company_info_id,is_leader as leader from company_member where company_info_id = #{companyInfoId}
+        select cm.id, cm.user_account_id, cm.company_info_id, cm.is_leader as leader
+        from company_member cm inner join user_account ua on ua.id = cm.user_account_id
+         where cm.company_info_id = #{companyInfoId} and ua.`disable` = 0
     </select>
 
     <select id="getAppCompanyInfoUId" resultType="com.mmc.iuav.user.entity.CompanyInfoDO">
@@ -215,7 +217,8 @@
     </select>
 
     <select id="countCompanyMembers" resultType="java.lang.Integer">
-        select count(*) from company_member where company_info_id = #{companyInfoId}
+        select count(*) from  company_member cm inner join user_account ua on ua.id = cm.user_account_id
+         where cm.company_info_id = #{companyInfoId} and ua.`disable` = 0
     </select>
 
     <select id="listCompanyMembersPage" resultType="com.mmc.iuav.user.entity.UserAccountDO">
@@ -230,7 +233,7 @@
             company_member cm
             INNER JOIN company_info ci ON cm.company_info_id = ci.id
             INNER JOIN user_account ua ON ua.id = cm.user_account_id
-        WHERE ci.id = #{id}
+        WHERE ci.id = #{id} and ua.`disable` = 0
         order by cm.is_leader desc, cm.create_time desc
         limit #{pageNo}, #{pageSize}
     </select>