Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-server-mdm

src/main/java/com/dk/mdm/controller/mst/StaffController.java

@@ -198,7 +198,7 @@ public class StaffController {
      */
     @PostMapping({"/feign_get_experience"})
     ResponseResultVO<StaffResponse> getFeignExperience(@RequestBody Map<String, Object> map) {
-        log.info("feign_get_experience1" + map.toString());
+        log.info("feign_get_experience111111111" + map.toString());
         StaffQuery staffQuery = new StaffQuery();
         staffQuery.setCpId(Integer.parseInt(map.get("cpId").toString()));
         staffQuery.setStaffCode(map.get("staffCode").toString());

src/main/java/com/dk/mdm/mapper/common/CommonMapper.xml

@@ -166,6 +166,7 @@
         top_Id     AS "topId",
         display_no AS "displayNo",
         remarks
+        ,flg_valid as "flgValid"
         from dkic_b.t_mst_org
         where flg_valid
         and cp_id = #{cpId}
@@ -256,6 +257,7 @@
         ,tmg.org_id as "orgId"
         ,tmg.org_code as "orgCode"
         ,tmg.org_name as "orgName"
+        ,staff.flg_valid as "flgValid"
         from dkic_b.t_mst_staff AS staff
         left join  dkic_b.t_mst_org tmg on tmg.org_id = staff.org_id
         where staff.flg_valid