|
|
@@ -94,7 +94,8 @@ public class AdminOrganizationController extends BaseApiController{
|
|
|
**/
|
|
|
@RequestMapping(value = "/updateOrganization" , method = RequestMethod.POST)
|
|
|
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,Integer approval,String approvalAid){
|
|
|
+ String remarks,String id,String abbreviation,String financeId,Integer workingHoursType,
|
|
|
+ Integer hideSign,String depNo,Integer approval,String approvalAid){
|
|
|
Result res = new Result();
|
|
|
if(StringUtils.isBlank(name) || StringUtils.isBlank(type)
|
|
|
|| StringUtils.isBlank(managerId)|| StringUtils.isBlank(superId)
|
|
|
@@ -110,7 +111,7 @@ public class AdminOrganizationController extends BaseApiController{
|
|
|
res.getError().add(buildError("","部门编号已存在"));
|
|
|
return res;
|
|
|
}
|
|
|
- if (approval==1&&StringUtils.isBlank(approvalAid)){
|
|
|
+ if (approval==null||(approval==1&&StringUtils.isBlank(approvalAid))){
|
|
|
res.getError().add(buildError("特批审核开启必须设置特批人"));
|
|
|
return res;
|
|
|
}
|