优化 查询当前登陆人所在单位下的所以项目列表 接口

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/ProjectController.java

@@ -13,9 +13,11 @@ import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import com.yeejoin.amos.boot.module.ugp.biz.service.impl.ProjectServiceImpl;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -176,8 +178,12 @@ public class ProjectController extends BaseController {
 	@ApiOperation(httpMethod = "GET", value = "查询当前登陆人所在单位下的所以项目列表", notes = "查询当前登陆人所在单位下的所以项目列表")
 	@GetMapping(value = "/getCompanyProjects")
 	public ResponseModel<List<Project>> getCompanyProjects(){
+		Long companyId = orgServiceImpl.getCompanyId();
+		if(ValidationUtil.isEmpty(companyId)){
+			return ResponseHelper.buildResponse(new ArrayList<>());
+		}
 		LambdaQueryWrapper<Project> wrapper = new LambdaQueryWrapper<>();
-		wrapper.eq(Project::getConstructionUnitId,orgServiceImpl.getCompanyId());
+		wrapper.eq(Project::getConstructionUnitId,companyId);
 		return ResponseHelper.buildResponse(projectServiceImpl.list(wrapper));
 	}
 }

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

@@ -239,6 +239,10 @@ public class OrgServiceImpl {
     public Long getCompanyId(){
         LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(OrgUsr :: getAmosOrgId,String.valueOf(getReginParams().getCompany().getSequenceNbr()));
-        return orgUsrServiceImpl.getOne(wrapper).getSequenceNbr();
+        OrgUsr orgUsr = orgUsrServiceImpl.getOne(wrapper);
+        if(ValidationUtil.isEmpty(orgUsr)){
+            return  null;
+        }
+        return orgUsr.getSequenceNbr();
     }
 }