Merge remote-tracking branch 'origin/developer' into developer

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/OrgServiceImpl.java

@@ -199,4 +199,14 @@ public class OrgServiceImpl {
         return map;
     }
 
+    /**
+     * 获取当前登陆人所在公司/单位/企业 下的 所有焊工人员
+     * @return
+     */
+    public List<Map> getCompanyWelder(){
+        LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(OrgUsr :: getAmosOrgId,String.valueOf(getReginParams().getCompany().getSequenceNbr()));
+        return getInfo(String.valueOf(orgUsrServiceImpl.getOne(wrapper).getSequenceNbr()));
+    }
+
 }