src/main/java/org/springblade/modules/discuss/entity/TopicsEntity.java
@@ -92,7 +92,7 @@ /** 0否 1是 */ @ApiModelProperty(value = "0否 1是", example = "") @TableField("delete_flag") @TableLogic // @TableLogic private Integer deleteFlag; /** 公益报名与议事表id */ src/main/java/org/springblade/modules/discuss/mapper/TopicsMapper.xml
@@ -45,6 +45,7 @@ <include refid="selectTopics"/> <where> <if test="id != null "> parent_id = #{id}</if> and delete_flag = 0 </where> </select> src/main/java/org/springblade/modules/system/mapper/UserMapper.java
@@ -122,4 +122,11 @@ * @return */ List<User> getUserInfoByDistrictIds(@Param("list") List<String> list); /** * 通过机构查询用户 * @param deptIdList * @return */ List<UserEntity> selectUserByDept(List<Long> deptIdList); } src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -258,4 +258,24 @@ </select> <select id="selectUserByDept" resultMap="userResultMap"> select * from blade_user where is_deleted = 0 and id != 1123598821738675201 <if test="deptIdList!=null and deptIdList.size>0"> and id in ( SELECT user_id FROM blade_user_dept WHERE dept_id IN <foreach collection="deptIdList" index="index" item="item" open="(" separator="," close=")"> #{item} </foreach> ) </if> ORDER BY create_time desc </select> </mapper> src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -600,8 +600,11 @@ IGridmanService bean = SpringUtil.getBean(IGridmanService.class); return bean.getGridManByCode(houseCode); } else { IPropertyCompanyDistrictService bean1 = SpringUtil.getBean(IPropertyCompanyDistrictService.class); return bean1.getDistictUserByCode(houseCode); // IPropertyCompanyDistrictService bean1 = SpringUtil.getBean(IPropertyCompanyDistrictService.class); // return bean1.getDistictUserByCode(houseCode); String deptId = AuthUtil.getDeptId(); List<Long> deptIdList = SysCache.getDeptChildIds(deptId); return baseMapper.selectUserByDept(deptIdList); } }