修改bug

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

@@ -16,7 +16,7 @@ import org.apache.ibatis.annotations.Param;
 * @date 2021-06-18
 */
 public interface OrgUsrMapper extends BaseMapper<OrgUsr> {
-    String selectUpUnitByParam(@Param("biz_org_code")String biz_org_code);
+    String selectUpUnitByParam(@Param("id")String biz_org_code);
 
 	List<Map<String, Object>> selectPersonList(Map<String, Object> map);
 

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

@@ -9,8 +9,8 @@
         `cb_org_usr`
         WHERE
         1=1
-        <if test="biz_org_code != null and biz_org_code != ''">
-        and `sequence_nbr` = ( SELECT parent_id FROM `cb_org_usr` WHERE biz_org_code = #{biz_org_code} and is_delete = 0 limit 1)
+        <if test="id != null and id != ''">
+        and `sequence_nbr` = ( SELECT parent_id FROM `cb_org_usr` WHERE sequence_nbr = #{id} and is_delete = 0 limit 1)
         </if>
 
     </select>

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

@@ -64,8 +64,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
     AlertFormServiceImpl iAlertFormServiceImpl;
 
     @Override
-    public String selectUpUnitByParam(String biz_org_code) {
-        return this.baseMapper.selectUpUnitByParam(biz_org_code);
+    public String selectUpUnitByParam(String id) {
+        return this.baseMapper.selectUpUnitByParam(id);
     }
 
     @Override
@@ -184,7 +184,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
             OrgUsr company = getById(ids.get(i));
             resultMap.put("id", company.getSequenceNbr());
             // 上级单位
-            resultMap.put("upUnit", selectUpUnitByParam(company.getBizOrgCode()));
+            resultMap.put("upUnit", selectUpUnitByParam(company.getSequenceNbr()+""));
             // 当前单位
             resultMap.put("currentUnit", company.getBizOrgName());
             // 下级单位
@@ -229,6 +229,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
                 	person.put("img", p.get("personImg"));
                 	person.put("id", p.get("sequenceNbr"));
                 	person.put("name", p.get("bizOrgName"));
+                	person.put("zhiwei", p.get("administrativePositionCode"));
                 	person.put("unit", p.get("fireManagementPostCode"));
                 	return person;
                 }).collect(Collectors.toList());