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

@@ -140,8 +140,6 @@ public interface OrgUsrMapper extends BaseMapper<OrgUsr> {
 
     List<OrgUsr> companyTreeByUserToPatrolRoute(Map<String, Object> param);
 
-    String getBizOrgCodeByOrgCode(String orgCode);
-
     OrgUsr queryByBizCode(@Param("code") String code);
 
 }

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

@@ -1165,7 +1165,7 @@ LEFT JOIN (
         FROM
         cb_org_usr u
         LEFT JOIN cb_firefighters_post cfp ON cfp.org_usr_id = u.sequence_nbr
-        LEFT JOIN cb_firefighters cf ON cf.org_usr_id = u.sequence_nbr
+        LEFT JOIN cb_firefighters cf ON CONCAT( u.sequence_nbr, '' ) = cf.org_usr_id
         LEFT JOIN cb_fire_team cft ON cft.sequence_nbr = cf.fire_team_id
         WHERE
         u.is_delete = 0
@@ -1187,14 +1187,4 @@ LEFT JOIN (
           and usr.is_delete = false
     </select>
 
-    <select id="getBizOrgCodeByOrgCode" resultType="java.lang.String">
-        SELECT
-            biz_org_code
-        FROM
-            cb_org_usr
-        where
-             is_delete = false
-        and amos_org_code = #{orgCode}
-        limit 1
-    </select>
 </mapper>

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

@@ -3536,7 +3536,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 
 	public List<OrgMenuDto> companyTreeByUserToPatrolRoute(ReginParams reginParams) {
 		Map<String, Object> param = new HashMap<>();
-		String bizOrgCode = orgUsrMapper.getBizOrgCodeByOrgCode(reginParams.getCompany().getOrgCode());
+		String bizOrgCode = reginParams.getPersonIdentity().getCompanyBizOrgCode();
 		param.put("bizOrgCode", bizOrgCode);
 		List<OrgUsr> list = orgUsrMapper.companyTreeByUserToPatrolRoute(param);
 		return buildTreeParallel(list);