|
|
@@ -1,19 +1,18 @@
|
|
|
package com.goafanti.organization.controller;
|
|
|
|
|
|
-import javax.annotation.Resource;
|
|
|
-
|
|
|
-import com.goafanti.common.dao.DepartmentMapper;
|
|
|
-import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
-import org.springframework.web.bind.annotation.RequestMethod;
|
|
|
-import org.springframework.web.bind.annotation.RestController;
|
|
|
-
|
|
|
import com.goafanti.common.bo.Result;
|
|
|
import com.goafanti.common.constant.ErrorConstants;
|
|
|
import com.goafanti.common.controller.BaseApiController;
|
|
|
+import com.goafanti.common.dao.DepartmentMapper;
|
|
|
import com.goafanti.common.utils.StringUtils;
|
|
|
import com.goafanti.organization.bo.OrganizationListOut;
|
|
|
import com.goafanti.organization.service.OrganizationService;
|
|
|
+import org.springframework.beans.factory.annotation.Autowired;
|
|
|
+import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
+import org.springframework.web.bind.annotation.RequestMethod;
|
|
|
+import org.springframework.web.bind.annotation.RestController;
|
|
|
+
|
|
|
+import javax.annotation.Resource;
|
|
|
|
|
|
@RestController
|
|
|
@RequestMapping("/api/admin/organization")
|
|
|
@@ -90,10 +89,12 @@ public class AdminOrganizationController extends BaseApiController{
|
|
|
res.data(organizationService.selectAllById(id));
|
|
|
return res;
|
|
|
}
|
|
|
- /**修改信息**/
|
|
|
+ /**
|
|
|
+ * 修改部门信息
|
|
|
+ **/
|
|
|
@RequestMapping(value = "/updateOrganization" , method = RequestMethod.POST)
|
|
|
- public Result updateOrganization(String name, String type, String managerId, String superId, String status,Integer province,
|
|
|
- String remarks,String id,String abbreviation,String financeId,Integer workingHoursType,Integer hideSign,String depNo){
|
|
|
+ public Result updateOrganization(String name, String type, String managerId, String superId, String status,Integer province,String retrialFinanceId,
|
|
|
+ String remarks,String id,String abbreviation,String financeId,Integer workingHoursType,Integer hideSign,String depNo){
|
|
|
Result res = new Result();
|
|
|
if(StringUtils.isBlank(name) || StringUtils.isBlank(type)
|
|
|
|| StringUtils.isBlank(managerId)|| StringUtils.isBlank(superId)
|
|
|
@@ -109,8 +110,8 @@ public class AdminOrganizationController extends BaseApiController{
|
|
|
res.getError().add(buildError("","部门编号已存在"));
|
|
|
return res;
|
|
|
}
|
|
|
- int i=organizationService.updateOrganization(name, type, managerId, superId, status, province,remarks,id,
|
|
|
- abbreviation,financeId,workingHoursType,hideSign,depNo);
|
|
|
+ int i=organizationService.updateOrganization(name, type, managerId, superId, status, province,
|
|
|
+ retrialFinanceId,remarks,id, abbreviation,financeId,workingHoursType,hideSign,depNo);
|
|
|
return res.data(i);
|
|
|
}
|
|
|
|