2023-08-07

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationMapper.java

@@ -23,7 +23,7 @@ public interface ProjectInformationMapper extends BaseMapper<ProjectInformation>
     @Select("select * from project_information")
     List<ProjectInformationVo> listAll();
     ProjectInformationVo getProjectBySid( @Param("sid") String sid);
-    @Select("select p.*,i.enterpriseName as enterpriseName from project_information p left join enterprise_project e on e.projectSid=p.sid left join enterprise_information i on i.sid=e.enterpriseSid where p.managerSid=#{sid}")
+    @Select("select p.*,i.enterpriseName as enterpriseName from project_information p left join enterprise_project e on e.projectSid=p.sid left join enterprise_information i on i.sid=e.enterpriseSid left join user_project u on u.projectSid =p.sid where u.userSid=#{sid}")
     List<ProjectInformationVo> getProjectByUserSid( @Param("sid") String sid);
     @Select("select p.*,i.enterpriseName as enterpriseName from project_information p left join enterprise_project e on e.projectSid=p.sid left join enterprise_information i on i.sid=e.enterpriseSid where p.bankSid=#{sid}")
     List<ProjectInformationVo> getProjectByBankSid( @Param("sid") String sid);

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java

@@ -114,18 +114,20 @@ public class ProjectInformationService extends MybatisBaseService<ProjectInforma
     public List<ProjectInformationVo> getProjectByUserSid(String sid){
         SysUser s =sysUserFeign.getUserBySid(sid).getData();
         //银行人员
-        if(s.getUserType().equals("3")){
+        if(s.getUserType()==3){
             BankManager b=bankManagerService.getOne(new QueryWrapper<BankManager>().eq("sid",s.getStaffSid()));
 //        bankInformationService.
-            for(String name:s.getRoleNames()){
-                if(name.equals("银行行长")){
-                    List<ProjectInformationVo> bank=baseMapper.getProjectByBankSid(b.getBankSid());
-                    return bank;
+            if(s.getRoleNames().size()>0){
+                for(String name:s.getRoleNames()){
+                    if(name.equals("银行行长")){
+                        List<ProjectInformationVo> bank=baseMapper.getProjectByBankSid(b.getBankSid());
+                        return bank;
+                    }
                 }
             }
-            List<ProjectInformationVo> bank=baseMapper.getProjectByUserSid(s.getStaffSid());
+            List<ProjectInformationVo> bank=baseMapper.getProjectByUserSid(s.getSid());
             return bank;
-        }else if(s.getUserType().equals("1")){
+        }else if(s.getUserType()==1){
             //监管人员
         }
         List<ProjectInformationVo> bank=baseMapper.getProjectByUser(s.getStaffSid());

yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserService.java

@@ -221,7 +221,9 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
         List<String> roles=new ArrayList<>();
         for(SysUserRole sysUserRole:s){
             SysRole sysRole=sysRoleService.getOne(new QueryWrapper<SysRole>().eq("sid",sysUserRole.getRoleSid()));
-            roles.add(sysRole.getName());
+            if(null!=sysRole){
+                roles.add(sysRole.getName());
+            }
         }
         entity.setRoleNames(roles);
         return entity;