java110 пре 5 година
родитељ
комит
06c16ef725

+ 1 - 1
java110-db/src/main/resources/mapper/user/OrgStaffRelServiceDaoImplMapper.xml

@@ -77,7 +77,7 @@
     <select id="getOrgStaffRelInfo" parameterType="Map" resultType="Map">
         select t.rel_id,t.rel_id relId,t.status_cd,t.status_cd statusCd,t.store_id,t.store_id storeId,t.b_id,t.b_id
         bId,t.org_id,t.org_id orgId,t.staff_id,t.staff_id staffId,t.rel_cd,t.rel_cd relCd,uo.parent_org_id parentOrgId,
-        uu.name staffName
+        uu.name staffName,uo.org_name departmentName,uo.org_id departmentId
         from u_org_staff_rel t,u_org uo,u_user uu
         where t.org_id = uo.org_id
         and t.staff_id = uu.user_id

+ 1 - 0
service-job/src/main/java/com/java110/job/adapt/hcIot/staff/DeleteStaffToIotAdapt.java

@@ -98,6 +98,7 @@ public class DeleteStaffToIotAdapt extends DatabusAdaptImpl {
         OrgStaffRelDto orgStaffRelDto = new OrgStaffRelDto();
         orgStaffRelDto.setStaffId(storeUserPo.getUserId());
         orgStaffRelDto.setStoreId(storeUserPo.getStoreId());
+        orgStaffRelDto.setStatusCd(StatusConstant.STATUS_CD_INVALID);
         List<OrgStaffRelDto> orgStaffRelDtos = orgStaffRelInnerServiceSMOImpl.queryOrgStaffRels(orgStaffRelDto);
 
         Assert.listOnlyOne(orgStaffRelDtos, "未包含员工信息");