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

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/SafetyProblemTracingController.java

@@ -12,6 +12,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
@@ -110,7 +111,11 @@ public class SafetyProblemTracingController extends BaseController {
 		Page<SafetyProblemTracingDto> page = new Page<>();
 		page.setCurrent(current);
 		page.setSize(size);
-		problemModel.setGoverningBodyOrgCode(loginParams.getCompany().getOrgCode());
+		if (!ValidationUtil.isEmpty(problemModel.getGoverningBodyOrgCode())) {
+			if (!problemModel.getGoverningBodyOrgCode().startsWith(loginParams.getCompany().getOrgCode())) {
+				return ResponseHelper.buildResponse(new Page<>());
+			}
+		}
 		return ResponseHelper.buildResponse(safetyProblemTracingServiceImpl.queryForSafetyProblemTracingPage(page, problemModel));
 	}