维保公司修改

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

@@ -161,8 +161,14 @@ public interface IMaintenanceCompanyService {
 	 * 将所有的维保人员导入到excle中
 	 * @return
 	 */
-	public List<MaintenancePersonExcleDto> exportToMaintenancePersonExcel(); 
-	
+	public List<MaintenancePersonExcleDto> exportToMaintenancePersonExcel();
+
+	/**
+	 * 获取附件列表
+	 *
+	 * @param sequenceNbr
+	 * @return
+	 */
 	public Map<String, List<AttachmentDto>> getAttachments(Long sequenceNbr);
 
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/MaintenanceCompanyController.java

@@ -6,6 +6,7 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.biz.service.impl.SourceFileServiceImpl;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -48,6 +49,8 @@ public class MaintenanceCompanyController extends BaseController {
 	@Autowired
 	MaintenanceCompanyServiceImpl maintenanceCompanyServiceImpl;
 
+    SourceFileServiceImpl sourceFileService;
+
 	@Autowired
 	IMaintenanceCompanyService maintenanceCompanyService;
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java

@@ -153,6 +153,19 @@ public class  OrgUsrController extends BaseController {
        return ResponseHelper.buildResponse(menus);
    }
 
+    /**
+     *
+     * 获取单位部门树
+     * @param
+     * @return
+     */
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/org/company/tree", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "获取单位树(bizOrgCode为物理主键)", notes = "获取单位树(bizOrgCode为物理主键)")
+    public ResponseModel< List<OrgMenuDto>> getCompanyTree() {
+        List<OrgMenuDto> menus = OrgUsrServiceImpl.buildTreeParallel(iOrgUsrService.selectCompanyList());
+        return ResponseHelper.buildResponse(menus);
+    }
 
     /**
      * 列表分页查询

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/MaintenanceCompanyServiceImpl.java

@@ -350,7 +350,7 @@ public class MaintenanceCompanyServiceImpl
 		int current = Integer.parseInt(paramsMap.get("current").toString());
 		int size = Integer.parseInt(paramsMap.get("size").toString());
 		String maintenanceType = paramsMap.get("maintenanceType").toString().toUpperCase();
-		Map<String, String> filedParamsMap = null;
+		Map<String, String> filedParamsMap = Maps.newHashMap();
 
 		List<MaintenanceCompany> mainTableList;
 		String type;
@@ -434,6 +434,7 @@ public class MaintenanceCompanyServiceImpl
 		return mainMap;
 	}
 
+	@Override
 	public Map<String, List<AttachmentDto>> getAttachments(Long sequenceNbr) {
 		Map<String, List<AttachmentDto>> attachmentMap = Maps.newHashMap();
 		List<SourceFile> sourceFileList = sourceFileService.findBySourceId(sequenceNbr);

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

@@ -14,6 +14,7 @@ import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.boot.module.common.api.dto.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -501,6 +502,17 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		return list;
 	}
 
+    public List<OrgUsr> selectCompanyList() {
+        List<OrgUsr> list =
+                list(new LambdaQueryWrapper<OrgUsr>().eq(OrgUsr::getIsDelete, false).eq(OrgUsr::getBizOrgType,
+                        "COMPANY"));
+        if (list == null) {
+            return new ArrayList<>();
+        }
+        list = list.stream().filter(o -> !ObjectUtils.isEmpty(o)).collect(Collectors.toList());
+        return list;
+    }
+
 	@Override
 	public void saveOrgUsr(OrgUsrDto OrgUsrVo) throws Exception {
 		OrgUsr orgUsr = new OrgUsr();