Skip to content

A
AmosBankPatrolRoot
Commit 25af537b authored by tangwei's avatar tangwei
Browse files
Options

修改路线orgcode

parent 8277bc45
Show whitespace changes
Inline Side-by-side
Showing with 22 additions and 7 deletions
AmosBankPatrolService/src/main/java/com/yeejoin/amos/patrol/service/business/controller/RouteController.java
View file @ 25af537b
...@@ -76,13 +76,19 @@ public class RouteController extends BaseController { ...@@ -76,13 +76,19 @@ public class RouteController extends BaseController {
@PostMapping(value = "/addRoute", produces = "application/json;charset=UTF-8") @PostMapping(value = "/addRoute", produces = "application/json;charset=UTF-8")
public CommonResponse addRoute(@ApiParam(value = "巡检路线", required = true) @RequestBody Route route) { public CommonResponse addRoute(@ApiParam(value = "巡检路线", required = true) @RequestBody Route route) {
try { try {
ReginParams reginParams = getSelectedOrgInfo(); // ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); // String loginOrgCode = getLoginOrgCode(reginParams);
route.setOrgCode(loginOrgCode); DepartmentModel departmentModel = remoteSecurityService.getDepartmentByDeptId(getToken(),getProduct(),getAppKey(), route.getDeptId());
if(departmentModel!=null){
route.setOrgCode(departmentModel.getOrgCode());
}
route.setIsDelete(false); route.setIsDelete(false);
if (routeService.existRouteName(loginOrgCode, route.getName())) { if (routeService.existRouteName(departmentModel.getOrgCode(), route.getName())) {
return CommonResponseUtil.failure("巡检路线名称重复"); return CommonResponseUtil.failure("巡检路线名称重复");
} }
Route newRoute = routeService.addRoute(route); Route newRoute = routeService.addRoute(route);
List<Long> routeIds = new ArrayList<>(); List<Long> routeIds = new ArrayList<>();
routeIds.add(newRoute.getId()); routeIds.add(newRoute.getId());
...@@ -101,9 +107,18 @@ public class RouteController extends BaseController { ...@@ -101,9 +107,18 @@ public class RouteController extends BaseController {
@PutMapping(value = "/updateRoute", produces = "application/json;charset=UTF-8") @PutMapping(value = "/updateRoute", produces = "application/json;charset=UTF-8")
public CommonResponse updateRoute(@ApiParam(value = "巡检路线", required = true) @RequestBody Route route) { public CommonResponse updateRoute(@ApiParam(value = "巡检路线", required = true) @RequestBody Route route) {
try { try {
ReginParams reginParams = getSelectedOrgInfo(); //ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getLoginOrgCode(reginParams); //String loginOrgCode = getLoginOrgCode(reginParams);
route.setOrgCode(loginOrgCode); //route.setOrgCode(loginOrgCode);
DepartmentModel departmentModel = remoteSecurityService.getDepartmentByDeptId(getToken(),getProduct(),getAppKey(), route.getDeptId());
if(departmentModel!=null){
route.setOrgCode(departmentModel.getOrgCode());
}
Route newRoute = routeService.updateRoute(route); Route newRoute = routeService.updateRoute(route);
List<Long> routeIds = new ArrayList<>(); List<Long> routeIds = new ArrayList<>();
routeIds.add(newRoute.getId()); routeIds.add(newRoute.getId());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment