1.维保公司修改

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IMaintenanceCompanyService.java

@@ -166,4 +166,8 @@ public interface IMaintenanceCompanyService {
     List<MaintenanceCompany> findByInstanceIdAndType(Long instanceId, String type);
 
 	List<MaintenanceCompany> findByCodeAndType(String code, String type);
+
+	List<MaintenanceCompany> findPersonByAmosOrgId(String code, String userId);
+
+	MaintenanceCompany getOne(Long parentId);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IOrgUsrService.java

@@ -108,8 +108,8 @@ public interface IOrgUsrService {
      * @throws Exception
      */
     Map<String, Object> selectForShowById(OrgUsr orgUsr, Long id) throws Exception;
-    Map<String, Object> selectForShowByIduser(OrgUsr orgUsr, Long id) throws Exception;
 
+    Map<String, Object> selectForShowByIduser(OrgUsr orgUsr, Long id) throws Exception;
 
 
     List<OrgUsr> selectCompanyDepartmentMsg();
@@ -145,7 +145,9 @@ public interface IOrgUsrService {
     OrgDepartmentFormDto selectDepartmentById(Long id) throws Exception;
 
     List<Map<String, Object>> selectForShowByListId(List<Long> ids) throws Exception;
+
     List<Map<String, Object>> selectForShowByListIdUser(List<Long> ids) throws Exception;
+
     /**
      * * @param null
      *
@@ -185,7 +187,7 @@ public interface IOrgUsrService {
 
     List<Map<String, Object>> getparent();
 
-    List<OrgUsrExcelDto> exportToExcel( Map par);
+    List<OrgUsrExcelDto> exportToExcel(Map par);
 
     UserUnitDto getUserUnit(String userId);
 
@@ -226,7 +228,7 @@ public interface IOrgUsrService {
      *
      * @param orgUserId
      * @return
-     * @exception
+     * @throws
      */
     AgencyUserModel getAmosIdByOrgUserId(String orgUserId) throws Exception;
 
@@ -235,12 +237,13 @@ public interface IOrgUsrService {
      *
      * @param orgUserIds
      * @return
-     * @exception
+     * @throws
      */
     List<String> getAmosIdListByOrgUserId(String orgUserIds) throws Exception;
 
     /**
      * 查询目标公司下所有人员的简要信息，数据包含：所在公司id和name ,人员id和name,岗位id和name
+     *
      * @param ids
      * @return
      */
@@ -252,12 +255,12 @@ public interface IOrgUsrService {
 
     OrgUsr selectByAmosOrgId(Long id);
 
-    
-    public List<OrgUsr> getPersonListByParentIds(List<String> ids) ;
+
+    List<OrgUsr> getPersonListByParentIds(List<String> ids);
+
     List<OrgUsrFormDto> getUnSyncOrgCompanyList(List<Long> companyIdList);
-    
-	public OrgUsr  getDetailById(	Long id);
 
+    OrgUsr getDetailById(Long id);
 
 
     /**
@@ -275,7 +278,7 @@ public interface IOrgUsrService {
      * @throws Exception
      */
     List<OrgMenuDto> getTreeFlc(Long topId, Collection entityList, String packageURL, String IDMethodName, int IDHierarchy,
-                             String NAMEMethodName, String PARENTIDMethodName, String OrgTypeMethodName) throws Exception;
+                                String NAMEMethodName, String PARENTIDMethodName, String OrgTypeMethodName) throws Exception;
 
 
     OrgUsrDto saveOrgPersonFlc(OrgPersonDto OrgPersonDto) throws Exception;