Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java

@@ -165,7 +165,8 @@ public enum EpmetErrorCode {
 	GROUP_ACT_CLOSED_CAN_NOT_EDIT(8902,"活动已关闭，不能编辑"),
 	PLEASE_INPUT_ACT_CONTENT(8903,"请输入活动内容,或添加图片"),
 	GROUP_ACT_CONTENT_MAX(8904,"活动内容至多输入1000字"),
-	GROUP_ACT_IMG_MAX(8905,"最多可添加3张图片");
+	GROUP_ACT_IMG_MAX(8905,"最多可添加3张图片"),
+	PARTY_MEMBER_CREATE_BRANCH_GROUP(8906,"您不是党员，不能创建支部小组");
 
 
 	private int code;

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ApplyingGroupResultDTO.java

@@ -45,6 +45,9 @@ public class ApplyingGroupResultDTO implements Serializable{
      * */
     private String messageText;
 
-
+    /**
+     * 小组类型(ordinary:楼院小组  branch:支部小组)
+     */
+    private String groupType;
 
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java

@@ -40,6 +40,7 @@ import com.epmet.dto.form.*;
 import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.dto.result.UserRoleResultDTO;
 import com.epmet.feign.EpmetMessageOpenFeignClient;
+import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.modules.constant.UserMessageConstant;
 import com.epmet.modules.feign.EpmetMessageFeignClient;
 import com.epmet.modules.feign.EpmetUserFeignClient;
@@ -147,6 +148,9 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 	@Autowired
 	private LoginUserUtil loginUserUtil;
 
+	@Autowired
+	private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
+
 	@Value("${openapi.scan.server.url}")
 	private String scanApiUrl;
 
@@ -365,6 +369,16 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 	@Transactional(rollbackFor = Exception.class)
 	@Override
 	public void applyCreateGroup(ApplyCreateGroupFormDTO applyCreateGroupFormDTO) {
+		// 查看是不是支部小组，在查询创建者是不是党员，不是党员就不走下面逻辑了
+		if (applyCreateGroupFormDTO.getGroupType().equals(ModuleConstant.GROUP_TYPE_BRANCH)){
+			Result<Boolean> booleanResult = epmetUserOpenFeignClient.selectIsPartyMemberByUserId(applyCreateGroupFormDTO.getUserId());
+			if (!booleanResult.success()){
+				throw new RenException(ModuleConstant.IS_PARTY_MEMBER_ERR);
+			}
+			if (!booleanResult.getData()){
+				throw new RenException(EpmetErrorCode.PARTY_MEMBER_CREATE_BRANCH_GROUP.getCode());
+			}
+		}
 		//1、校验是否同名
 		List<ResiGroupEntity> resiGroupEntityList = this.getResiGroupEntityList(applyCreateGroupFormDTO);
 		if (null != resiGroupEntityList && resiGroupEntityList.size() > 0) {

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java

@@ -380,4 +380,11 @@ public interface ModuleConstant extends Constant {
 	 * 通过议题分享链接进组
 	 */
 	String ENTER_GROUP_TYPE_ISSUE_LINK = "issue_share_link";
+
+	/**
+	 * 小组类型：支部小组
+	 */
+	String GROUP_TYPE_BRANCH = "branch";
+
+	String IS_PARTY_MEMBER_ERR = "查询此人是不是党员失败了";
 }

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml

@@ -245,6 +245,7 @@
     <select id="getApplyingGroupsByCustIdAndGridId" parameterType="com.epmet.resi.group.dto.group.form.ApplyingGroupsFormDTO" resultType="com.epmet.resi.group.dto.group.result.ApplyingGroupResultDTO">
     SELECT
 	gro.ID AS groupId,
+    gro.GROUP_TYPE AS groupType,
 	gro.GROUP_NAME AS groupName,
 	gro.GROUP_HEAD_PHOTO AS groupHeadPhoto,
 	oper.READ_FLAG AS readFlag,

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@@ -505,4 +505,13 @@ public interface EpmetUserOpenFeignClient {
      **/
     @PostMapping(value = "/epmetuser/userrole/getuserroleinfo")
     Result<List<UserRoleResultDTO>> getUserRoleInfo(@RequestBody UserRoleFormDTO userRoleFormDTO);
+
+    /**
+     * @Description  查询此人是不是党员，true是党员，false不是党员
+     * @Param userId
+     * @author zxc
+     * @date 2021/4/19 下午4:34
+     */
+    @GetMapping(value = "/epmetuser/userrole/ispartymember")
+    Result<Boolean> selectIsPartyMemberByUserId(@RequestParam("userId") String userId);
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

@@ -358,4 +358,9 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
     public Result<List<UserRoleResultDTO>> getUserRoleInfo(UserRoleFormDTO userRoleFormDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getUserRoleInfo", userRoleFormDTO);
     }
+
+    @Override
+    public Result<Boolean> selectIsPartyMemberByUserId(String userId) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "selectIsPartyMemberByUserId", userId);
+    }
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.java

@@ -132,4 +132,15 @@ public class UserRoleController {
 	public Result<List<UserRoleResultDTO>> getUserRoleInfoByUserId(@PathVariable("userId") String userId) {
 		return userRoleService.getUserRoleInfoByUserId(userId);
 	}
+
+	/**
+	 * @Description  查询此人是不是党员，true是党员，false不是党员
+	 * @Param userId
+	 * @author zxc
+	 * @date 2021/4/19 下午4:34
+	 */
+	@GetMapping("ispartymember")
+	public Result<Boolean> selectIsPartyMemberByUserId(@RequestParam("userId") String userId){
+		return new Result<Boolean>().ok(userRoleService.selectIsPartyMemberByUserId(userId));
+	}
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java

@@ -81,4 +81,12 @@ public interface UserRoleDao extends BaseDao<UserRoleEntity> {
      * @date 2020/11/18 上午10:50
      */
     List<PartyMemberUserIdsResultDTO> selectPartyMemberUserIds();
+
+    /**
+     * @Description  查询此人是不是党员
+     * @Param userId
+     * @author zxc
+     * @date 2021/4/19 下午4:29
+     */
+    Integer selectIsPartyMemberByUserId(@Param("userId")String userId);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserRoleService.java

@@ -122,4 +122,12 @@ public interface UserRoleService extends BaseService<UserRoleEntity> {
      * @Date 14:24 2020-07-23
      **/
 	Result<List<UserRoleResultDTO>> getUserRoleInfoByUserId(String userId);
+
+	/**
+	 * @Description  查询此人是不是党员，true是党员，false不是党员
+	 * @Param userId
+	 * @author zxc
+	 * @date 2021/4/19 下午4:34
+	 */
+	Boolean selectIsPartyMemberByUserId(String userId);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserRoleServiceImpl.java

@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
@@ -138,4 +139,19 @@ public class UserRoleServiceImpl extends BaseServiceImpl<UserRoleDao, UserRoleEn
 		return new Result<List<UserRoleResultDTO>>().ok(list);
 	}
 
+	/**
+	 * @Description  查询此人是不是党员，true是党员，false不是党员
+	 * @Param userId
+	 * @author zxc
+	 * @date 2021/4/19 下午4:34
+	 */
+	@Override
+	public Boolean selectIsPartyMemberByUserId(String userId) {
+		Integer num = baseDao.selectIsPartyMemberByUserId(userId);
+		if (null != num && num > NumConstant.ZERO){
+			return true;
+		}
+		return false;
+	}
+
 }

epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml

@@ -112,4 +112,16 @@
           AND er.ROLE_KEY = 'partymember'
     </select>
 
+    <!-- 查询此人是不是党员 -->
+    <select id="selectIsPartyMemberByUserId" resultType="java.lang.Integer">
+        SELECT
+            COUNT(ur.USER_ID)
+        FROM user_role ur
+        LEFT JOIN epmet_role er ON er.ID = ur.ROLE_ID
+        WHERE ur.DEL_FLAG = 0
+          AND er.DEL_FLAG = 0
+          AND er.ROLE_KEY = 'partymember'
+          AND ur.USER_ID = #{userId}
+    </select>
+
 </mapper>