修改区域统计工单 导办工单显示 部门管理显示 bug

lidongdong

2022-10-24 cb7a2ad2680b0d6483956e1ba374642ecf8d3115

修改区域统计工单   导办工单显示  部门管理显示  bug

 flower_city/src/main/java/com/dg/core/controller/GuideDoController.java

@@ -3,9 +3,12 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dg.core.ResultData;
import com.dg.core.annotation.Authorization;
import com.dg.core.annotation.CurrentUser;
import com.dg.core.db.gen.entity.SysUser;
import com.dg.core.service.IGuideRepairOrderService;
import com.dg.core.service.IOrganizationChartService;
import com.dg.core.service.ISysUserService;
import com.dg.core.util.PermissionUtil;
import com.dg.core.util.Snowflake;
import com.dg.core.util.TableDataInfo;
import io.swagger.annotations.Api;
@@ -33,6 +36,9 @@
    @Autowired
    IGuideRepairOrderService iGuideRepairOrderService;

    @Autowired
    IOrganizationChartService iOrganizationChartService;

    /**
     * 查询列表
     *
@@ -43,14 +49,16 @@
    @Authorization
    public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
                                          @RequestParam(value = "pageSize",required = false) Integer pageSize,
                                          @RequestParam(value = "keyword",required = false) String keyword)
                                          @RequestParam(value = "keyword",required = false) String keyword,
                                          @CurrentUser SysUser sysUser)
    {
        Assert.notNull(pageNum, "pageNum can not be empty");
        Assert.notNull(pageSize, "pageSize can not be empty");
        Page<SysUser> pageParam = new Page<>(pageNum,pageSize);
        List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"2",keyword);
        List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
        List<SysUser> list = IUserService.selectConfigList(pageParam,pageSize,"2",keyword,ids);

        int num=IUserService.selectNum("2",keyword);
        int num=IUserService.selectNum("2",keyword,ids);
        return getDataTable(list,num);
    }


 flower_city/src/main/java/com/dg/core/controller/OrganizationController.java

@@ -9,6 +9,7 @@
import com.dg.core.db.gen.entity.TransactionEvent;
import com.dg.core.service.IOrganizationChartService;
import com.dg.core.service.ITransactionEventService;
import com.dg.core.util.PermissionUtil;
import com.dg.core.util.TableDataInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -138,11 +139,14 @@
    @Authorization
    public TableDataInfo queryList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
                                            @RequestParam(value = "pageSize",required = false) Integer pageSize,
                                            @RequestParam(value = "organizationName",required = false)String organizationName){
                                            @RequestParam(value = "organizationName",required = false)String organizationName,
                                   @CurrentUser SysUser sysUser){
        Assert.notNull(pageNum, "pageNum can not be empty");
        Assert.notNull(pageSize, "pageSize can not be empty");
        Page<OrganizationChartEntity> pageParam = new Page<>(pageNum,pageSize);
        return getDataTable(iOrganizationChartService.queryList(pageParam,pageSize,organizationName),iOrganizationChartService.countList(organizationName));
        List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
        return getDataTable(iOrganizationChartService.queryList(pageParam,pageSize,organizationName,ids),
                            iOrganizationChartService.countList(organizationName,ids));
    }



 flower_city/src/main/java/com/dg/core/db/gen/mapper/OrganizationChartMapper.java

@@ -50,13 +50,14 @@
    /**
     * 查询机构列表(分页)
     */
    List<OrganizationChartEntity> queryList(IPage<OrganizationChartEntity> page, Integer state, String organizationName);
    List<OrganizationChartEntity> queryList(IPage<OrganizationChartEntity> page, Integer state,
                                            @Param("organizationName") String organizationName,@Param("ids") List<String> ids);


    /**
     * 统计数量(部门应用)
     */
    int countList(String organizationName);
    int countList(@Param("organizationName") String organizationName,@Param("ids") List<String> ids);


    /**

 flower_city/src/main/java/com/dg/core/db/gen/mapper/SysUserMapper.java

@@ -28,7 +28,8 @@
     */
    public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,
                                          @Param("userType") String userType,
                                          @Param("userName") String userName);
                                          @Param("userName") String userName,
                                          @Param("ids") List<String> ids);



@@ -67,7 +68,9 @@
     *
     * @return 结果
     */
    public int selectNum(@Param("userType") String userType,@Param("userName") String userName);
    public int selectNum(@Param("userType") String userType,
                         @Param("userName") String userName,
                         @Param("ids") List<String> ids);

    /**
     * 根据部门id及分类id获取导办用户

 flower_city/src/main/java/com/dg/core/service/IOrganizationChartService.java

@@ -46,13 +46,13 @@
    /**
     * 查询机构列表(分页)
     */
    List<OrganizationChartEntity> queryList(IPage<OrganizationChartEntity> page, Integer state, String organizationName);
    List<OrganizationChartEntity> queryList(IPage<OrganizationChartEntity> page, Integer state, String organizationName,List<String> ids);


    /**
     * 统计数量(部门应用)
     */
    int countList(String organizationName);
    int countList(String organizationName,List<String> ids);

    /**
     * 获取部门下子部门的全部id

 flower_city/src/main/java/com/dg/core/service/ISysUserService.java

@@ -14,7 +14,8 @@
     *
     * @return 参数配置信息
     */
    public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,String userType,String userName);
    public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,String userType,
                                          String userName,List<String> ids);


    SysUser selectData(String userId,String phonenumber,String loginName);
@@ -48,7 +49,7 @@
     *
     * @return 结果
     */
    public int selectNum(String userType,String userName);
    public int selectNum(String userType,String userName,List<String> ids);

    /**
     * 发送验证码(如果没有该用户则新建用户)

 flower_city/src/main/java/com/dg/core/service/impl/OrganizationChartImpl.java

@@ -80,13 +80,14 @@
    }

    @Override
    public List<OrganizationChartEntity> queryList(IPage<OrganizationChartEntity> page, Integer state, String organizationName) {
        return baseMapper.queryList(page,state,organizationName);
    public List<OrganizationChartEntity> queryList(IPage<OrganizationChartEntity> page, Integer state,
                                                   String organizationName,List<String> ids) {
        return baseMapper.queryList(page,state,organizationName,ids);
    }

    @Override
    public int countList(String organizationName) {
        return baseMapper.countList(organizationName);
    public int countList(String organizationName,List<String> ids) {
        return baseMapper.countList(organizationName,ids);
    }



 flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java

@@ -240,8 +240,8 @@
    }

    @Override
    public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,String userType,String userName) {
        return baseMapper.selectConfigList(page, state,userType,userName);
    public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,String userType,String userName,List<String> ids) {
        return baseMapper.selectConfigList(page, state,userType,userName,ids);
    }

    @Override
@@ -284,8 +284,8 @@
    }

    @Override
    public int selectNum(String userType,String userName) {
        return baseMapper.selectNum(userType,userName);
    public int selectNum(String userType,String userName,List<String> ids) {
        return baseMapper.selectNum(userType,userName,ids);
    }



 flower_city/src/main/resources/mapper/OrganizationChartMapper.xml

@@ -59,6 +59,12 @@
            <if test="organizationName != null and organizationName != ''">
                AND organization_name like concat('%', #{organizationName}, '%')
            </if>
            <if test="ids != null">
                and id IN
                <foreach collection="ids" item="param"  open="(" close=")" separator=",">
                    #{param}
                </foreach>
            </if>
        </where>
    </select>

@@ -68,6 +74,12 @@
            <if test="organizationName != null and organizationName != ''">
                AND organization_name like concat('%', #{organizationName}, '%')
            </if>
            <if test="ids != null">
                and id IN
                <foreach collection="ids" item="param"  open="(" close=")" separator=",">
                    #{param}
                </foreach>
            </if>
        </where>
    </select>


 flower_city/src/main/resources/mapper/SysUserMapper.xml

@@ -107,6 +107,12 @@
            <if test="userType != null and userType != ''">
                AND user_type=#{userType}
            </if>
            <if test="ids != null">
                and department_id IN
                <foreach collection="ids" item="param"  open="(" close=")" separator=",">
                    #{param}
                </foreach>
            </if>
        </where>
    </select>

@@ -133,7 +139,12 @@
            <if test="userType != null and userType != ''">
                AND user_type=#{userType}
            </if>

            <if test="ids != null">
                and department_id IN
                <foreach collection="ids" item="param"  open="(" close=")" separator=",">
                    #{param}
                </foreach>
            </if>
        </where>
        order by create_time desc
    </select>