修改bug

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/OrgUsrMapper.java

@@ -107,6 +107,8 @@ public interface OrgUsrMapper extends BaseMapper<OrgUsr> {
     @DataAuth(interfacePath="")
     List<OrgUsr> companyDeptListWithPersonCount(Map<String, Object> param);
 
+    List<OrgUsr> companyTreeByUser(String bizOrgCode);
+
     Map<String,String> selectPersonone(@Param("name")String name ,@Param("id")Long id);
 
     List<OrgUsr> listByOrgTypes(@Param("orgTypeList") List<String> orgTypeList,@Param("bizOrgCode") String bizOrgCode);

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IOrgUsrService.java

@@ -315,4 +315,7 @@ public interface IOrgUsrService {
      * @return List<OrgMenuDto>
      */
     List<OrgMenuDto> companyTreeByUserNumber(ReginParams reginParams);
+
+    List<OrgMenuDto> companyTreeByUser(ReginParams reginParams);
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -780,6 +780,19 @@ LEFT JOIN (
          (usr.biz_org_type = 'COMPANY' OR usr.biz_org_type = 'DEPARTMENT')
         and usr.is_delete = false
     </select>
+
+    <select id="companyTreeByUser"
+            resultType="com.yeejoin.amos.boot.module.common.api.entity.OrgUsr">
+        SELECT
+            usr.*
+        FROM
+            cb_org_usr usr
+        where
+            (usr.biz_org_type = 'COMPANY' OR usr.biz_org_type = 'DEPARTMENT')
+          and usr.is_delete = false
+          and usr.biz_org_code like CONCAT(#{bizOrgCode},'%')
+    </select>
+
     <select id="listByOrgTypes" resultType="com.yeejoin.amos.boot.module.common.api.entity.OrgUsr">
         select
             *

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java

@@ -435,6 +435,17 @@ public class OrgUsrController extends BaseController {
         return ResponseHelper.buildResponse(menus);
     }
 
+    @PersonIdentify
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/companyTreeByUserCurrent", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "根据登录人获取当前公司部门树", notes = "根据登录人获取当前公司部门树")
+    public ResponseModel<List<OrgMenuDto>> companyTreeByUser() {
+        // 获取登陆人角色
+        ReginParams reginParams = getSelectedOrgInfo();
+        List<OrgMenuDto> menus = iOrgUsrService.companyTreeByUser(reginParams);
+        return ResponseHelper.buildResponse(menus);
+    }
+
     /**
      * 获取单位部门树
      *

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DutyCarServiceImpl.java

@@ -182,23 +182,25 @@ public class DutyCarServiceImpl extends DutyCommonServiceImpl implements IDutyCa
 						// 获取当前装备ID下的排版数据
 						List<Map<String, Object>> specifyDateList = dutyPersonShiftMapper.getPositionStaffDutyForSpecifyDate(dutyDay,
 								this.getGroupCode(), instanceIds,null);
-						if(specifyDateList==null || specifyDateList.size() < 1 || specifyDateList.get(0)==null) {
+						/*if(specifyDateList==null || specifyDateList.size() < 1 || specifyDateList.get(0)==null) {
 							continue;
-						}
+						}*/
 						LinkedHashMap<String, Object> infoMap_1 =new LinkedHashMap<String, Object>();
 						//取消掉班次的显示---2022-01-16 by chenhao ---start
 						//infoMap_1.put(dutyDetail.get("name").toString(), "");
 						//resultList.add(infoMap_1);
 						//取消掉班次的显示---2022-01-16 by chenhao ---end
-						for (Map<String, Object> specify : specifyDateList) {
-							LinkedHashMap<String, Object> infoMap_2 =new LinkedHashMap<String, Object>();
+						if (specifyDateList.size()>0 && specifyDateList != null) {
+					for (Map<String, Object> specify : specifyDateList) {
+						LinkedHashMap<String, Object> infoMap_2 = new LinkedHashMap<String, Object>();
 //							infoMap_2.put(specify.get("postTypeName").toString(),specify.get("userName").toString());
 //							resultList.add(infoMap_2);
-							if( specify.containsKey("postTypeName")&& specify.get("postTypeName")!=null && specify.containsKey("userName")&& specify.get("userName")!=null ) {
-								infoMap_2.put(specify.get("postTypeName").toString(),specify.get("userName").toString());
-								resultList.add(infoMap_2);
-							}
+						if (specify.containsKey("postTypeName") && specify.get("postTypeName") != null && specify.containsKey("userName") && specify.get("userName") != null) {
+							infoMap_2.put(specify.get("postTypeName").toString(), specify.get("userName").toString());
+							resultList.add(infoMap_2);
 						}
+					}
+				}
 				//	}
 				//}
 			}

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -2138,6 +2138,15 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         List<OrgUsr> list = orgUsrMapper.companyDeptListWithPersonCount(param);
         return buildTreeParallel(list);
     }
+
+    @Override
+    public List<OrgMenuDto> companyTreeByUser(ReginParams reginParams) {
+        Map<String, Object> param = new HashMap<>();
+        // 权限处理
+        PermissionInterceptorContext.setDataAuthRule(authKey);
+        List<OrgUsr> list = orgUsrMapper.companyTreeByUser(reginParams.getPersonIdentity().getBizOrgCode());
+        return buildTreeParallel(list);
+    }
     /**
      * 同步单位信息到防火监督point表
      *