jczz_manager.git

			@@ -39,7 +39,9 @@
			import org.springblade.modules.house.vo.HouseRentalVO;
			import org.springblade.modules.house.vo.HouseholdVO;
			import org.springblade.modules.system.entity.User;
			import org.springblade.modules.system.entity.UserInfo;
			import org.springblade.modules.system.service.IUserService;
			import org.springblade.modules.system.vo.UserDetailVO;
			import org.springblade.modules.system.vo.UserVO;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Service;
			@@ -295,7 +297,7 @@
			// 删除用户。判断用户是否有其他角色,
			for (HouseholdEntity householdEntity : removeList) {
			if (householdEntity.getAssociatedUserId() != null) {
			UserVO userVO = userService.getuserById(householdEntity.getAssociatedUserId());
			User userVO = userService.getById(householdEntity.getAssociatedUserId());
			if (userVO.getRoleId().contains("1717429059648606209")) {
			List<String> stringList = Arrays.asList(userVO.getRoleId().split(","));
			// 有其他角色
			@@ -305,8 +307,9 @@
			userService.updateById(userVO);
			} else {
			// 没有其他角色
			userVO.setRoleId(null);
			userService.removeById(userVO.getId());
			userVO.setRoleId("");
			boolean b = userService.updateById(userVO);
			System.out.println(b);
			}
			}
			}

			@@ -49,16 +49,11 @@

			<if test="isAdministrator==2">
			<!-- 网格员及其他 -->
			<if test="vo.roleType ==null">
			<if test="residen.roleType ==null">
			<choose>
			<when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
			and (
			jg.grid_code in
			<foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
			#{code}
			</foreach>
			or
			jp.grid_code in
			<foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
			#{code}
			</foreach>
			@@ -73,11 +68,6 @@
			<foreach collection="gridCodeList" item="code" open="(" close=")" separator=",">
			#{code}
			</foreach>
			or
			jp.grid_code in
			<foreach collection="gridCodeList" item="code" open="(" close=")" separator=",">
			#{code}
			</foreach>
			)
			</when>
			<otherwise>
			@@ -85,8 +75,8 @@
			</otherwise>
			</choose>

			<if test="vo.confirmUserId != null ">
			or jtrfr.confirm_user_id = #{vo.confirmUserId}
			<if test="residen.confirmUserId != null ">
			or jtrfr.confirm_user_id = #{residen.confirmUserId}
			</if>

			</if>

			@@ -57,4 +57,7 @@

			@ApiModelProperty(value = "未成年 1：否 2：是", example = "")
			private Integer minors;

			@ApiModelProperty(value = "角色类型", example = "")
			private String roleType;
			}

	src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java	9 ●●●●● patch \| view \| raw \| blame \| history
	src/main/java/org/springblade/modules/task/mapper/TaskResidencePermitApplyMapper.xml	16 ●●●●● patch \| view \| raw \| blame \| history
	src/main/java/org/springblade/modules/task/vo/TaskResidencePermitApplyVO.java	3 ●●●●● patch \| view \| raw \| blame \| history