fix bug 42005 BXGLZ用户的角色配置确认

jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectSubitemController.java

@@ -50,7 +50,7 @@ public class TbMemberProjectSubitemController extends JeroController<TbMemberPro
 								   HttpServletRequest req) {
 		QueryWrapper<TbMemberProjectSubitem> queryWrapper = QueryGenerator.initQueryWrapper(tbMemberProjectSubitem, req.getParameterMap());
 		Page<TbMemberProjectSubitem> page = new Page<>(pageNo, pageSize);
-		IPage<TbMemberProjectSubitem> pageList = tbMemberProjectSubitemService.page(page, queryWrapper);
+		IPage<TbMemberProjectSubitem> pageList = tbMemberProjectSubitemService.pageList(page, queryWrapper);
 		for (TbMemberProjectSubitem record : pageList.getRecords()) {
 			record.setEmail(PasswordUtil.decrypt(record.getEmail()));
 			record.setMobile(PasswordUtil.decrypt(record.getMobile()));
@@ -64,7 +64,10 @@ public class TbMemberProjectSubitemController extends JeroController<TbMemberPro
 	@RequiresPermissions("safeguardStardsMember:export")
     @GetMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, TbMemberProjectSubitem tbMemberProjectSubitem) {
-        return super.exportXls(request, tbMemberProjectSubitem, TbMemberProjectSubitem.class, "标协会员项目成员表");
+		QueryWrapper<TbMemberProjectSubitem> queryWrapper = QueryGenerator.initQueryWrapper(tbMemberProjectSubitem, request.getParameterMap());
+		Page<TbMemberProjectSubitem> page = new Page<>(-1, -1);
+		IPage<TbMemberProjectSubitem> pageList = tbMemberProjectSubitemService.pageList(page, queryWrapper);
+        return super.exportListXls(pageList.getRecords(), TbMemberProjectSubitem.class, "标协会员项目成员表");
     }
 
 }

jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/TbMemberProjectSubitemMapper.java

@@ -2,7 +2,9 @@ package com.jero.member.mapper;
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import com.jero.member.entity.TbMemberProjectSubitem;
@@ -29,4 +31,5 @@ public interface TbMemberProjectSubitemMapper extends BaseMapper<TbMemberProject
      */
     IPage<TbMemberProjectSubitem> queryListByCompany(Page<TbMemberProjectSubitem> page,@Param("companyId") String companyId,@Param("projectType") String projectType,@Param("pack") Integer pack,@Param("packYear") String packYear);
 
+    IPage<TbMemberProjectSubitem> pageList(Page<TbMemberProjectSubitem> page, @Param(Constants.WRAPPER) QueryWrapper<TbMemberProjectSubitem> queryWrapper);
 }

jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectSubitemMapper.xml

@@ -39,4 +39,11 @@
         </if>
         GROUP BY tmps.id ORDER BY tmps.create_time DESC
     </select>
+
+    <select id="pageList" resultMap="TbMemberProjectSubitemResultMap">
+        select distinct tmps.*
+        from tb_member_project_subitem tmps
+            LEFT JOIN tb_member_project tmp on tmp.id = tmps.project_id
+        ${ew.customSqlSegment}
+    </select>
 </mapper>

jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java

@@ -1,5 +1,6 @@
 package com.jero.member.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.member.entity.TbMemberProjectSubitem;
@@ -71,4 +72,6 @@ public interface ITbMemberProjectSubitemService extends IService<TbMemberProject
 	 * @Exception
 	 */
 	IPage<TbMemberProjectSubitem> queryListByCompany(Page<TbMemberProjectSubitem> page, String companyId, String projectType,Integer pack,String packYear);
+
+	IPage<TbMemberProjectSubitem> pageList(Page<TbMemberProjectSubitem> page, QueryWrapper<TbMemberProjectSubitem> queryWrapper);
 }

jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/TbMemberProjectServiceImpl.java

@@ -113,7 +113,11 @@ public class TbMemberProjectServiceImpl extends ServiceImpl<TbMemberProjectMappe
     public IPage<TbMemberProject> queryPageList(Page<TbMemberProject> page, QueryWrapper<TbMemberProject> queryWrapper) {
 		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		if (!rolePermissionService.getRolePermission("stardsMember:search")) {
-			queryWrapper.eq("pm.director_id",sysUser.getId());
+			queryWrapper.or(
+					a -> a.eq("pm.director_id",sysUser.getId())
+							.or()
+							.eq("tmp.director_id",sysUser.getId())
+			);
 		}
         return baseMapper.queryPageList(page,queryWrapper);
     }

jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/TbMemberProjectSubitemServiceImpl.java

@@ -1,10 +1,13 @@
 package com.jero.member.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.exception.JeroBootException;
+import com.jero.common.service.RolePermissionService;
+import com.jero.common.system.vo.LoginUser;
 import com.jero.contract.entity.PayIncomeContractAssociated;
 import com.jero.contract.service.IPayIncomeContractAssociatedService;
 import com.jero.contract.service.IPayIncomeContractService;
@@ -17,6 +20,7 @@ import com.jero.pack.service.IPayPackCompanyProjectService;
 import com.jero.project.common.PayProjectCommon;
 import com.jero.temporary.service.IPayCompanyManagementTemporaryService;
 import com.jero.temporary.service.IPayContactsManagementTemporaryService;
+import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -54,6 +58,8 @@ public class TbMemberProjectSubitemServiceImpl extends ServiceImpl<TbMemberProje
 	private IPayContactsManagementTemporaryService payContactsManagementTemporaryService;
 	@Resource
 	private ITbMemberProjectSubitemService tbMemberProjectSubitemService;
+	@Resource
+	private RolePermissionService rolePermissionService;
 	/**
 	 * 保存
 	 */
@@ -135,4 +141,13 @@ public class TbMemberProjectSubitemServiceImpl extends ServiceImpl<TbMemberProje
 	public IPage<TbMemberProjectSubitem> queryListByCompany(Page<TbMemberProjectSubitem> page, String companyId, String projectType,Integer pack,String packYear) {
 		return tbMemberProjectSubitemMapper.queryListByCompany(page, companyId, projectType,pack,packYear);
 	}
+
+    @Override
+    public IPage<TbMemberProjectSubitem> pageList(Page<TbMemberProjectSubitem> page, QueryWrapper<TbMemberProjectSubitem> queryWrapper) {
+		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		if (!rolePermissionService.getRolePermission("safeguardStardsMember:search")) {
+			queryWrapper.eq("tmp.director_id",sysUser.getId());
+		}
+        return baseMapper.pageList(page,queryWrapper);
+    }
 }