实习调整

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/practice/register/service/RegistrationService.java

@@ -734,6 +734,10 @@ public class RegistrationService extends ServiceImpl<InterRegistrationMapper, Re
                 keyMap.put("name", "评估员工,共有权限（评估）");
                 keyMap.put("tenantId", officeDTO.getTenantId());
                 roleIdList = SpringUtil.getBean(IRoleApi.class).getRoleDTOByNameAndTenantId(keyMap);
+            }else if (officeDTO.getTenantId().equals("10005")) {
+                keyMap.put("name", "项目公司员工,共有权限（项目）");
+                keyMap.put("tenantId", officeDTO.getTenantId());
+                roleIdList = SpringUtil.getBean(IRoleApi.class).getRoleDTOByNameAndTenantId(keyMap);
             }
         } else {
             TenantDTO tenantDTO = new TenantDTO();

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/service/OfficeService.java

@@ -119,7 +119,7 @@ public class OfficeService extends TreeService <OfficeMapper, Office> {
         queryWrapper.like ( StringUtils.isNotBlank ( parentId ), "a.parent_ids", "," + parentId + "," );
 
         queryWrapper.eq("a.del_flag", 0);
-        queryWrapper.and(wrapper -> wrapper.eq("a.tenant_id", "10003").or().eq("a.tenant_id", "10001").or().eq("a.tenant_id", "10005"));
+        queryWrapper.and(wrapper -> wrapper.eq("a.tenant_id", "10003").or().eq("a.tenant_id", "10001").or().eq("a.tenant_id", "10005").or().eq("a.tenant_id", "10004"));
 
         queryWrapper.orderByAsc ( "a.sort" );
         return baseMapper.findList ( queryWrapper );