|
|
@@ -47,7 +47,8 @@ public class AdminOrganizationController extends BaseApiController{
|
|
|
}
|
|
|
/**部门组织管理新增**/
|
|
|
@RequestMapping(value = "/addOrganization" , method = RequestMethod.POST)
|
|
|
- public Result addOrganization(String name, String managerId, String type, String superId, String remarks,Integer workingHoursType) throws Exception{
|
|
|
+ public Result addOrganization(String name, String managerId, String type, String superId, String remarks,
|
|
|
+ Integer workingHoursType,Integer hideSign) throws Exception{
|
|
|
Result res = new Result();
|
|
|
if(StringUtils.isBlank(name) || StringUtils.isBlank(type) || StringUtils.isBlank(superId)){
|
|
|
res.getError().add(buildError("","组织名称、组织类型、上级组织不能为空"));
|
|
|
@@ -65,7 +66,7 @@ public class AdminOrganizationController extends BaseApiController{
|
|
|
return res;
|
|
|
}
|
|
|
|
|
|
- organizationService.addOrganization(name, managerId, type, superId, remarks,sdepNo,count,workingHoursType);
|
|
|
+ organizationService.addOrganization(name, managerId, type, superId, remarks,sdepNo,count,workingHoursType,hideSign);
|
|
|
|
|
|
return res;
|
|
|
}
|
|
|
@@ -86,7 +87,7 @@ 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 remarks,String id,String abbreviation,String financeId,Integer workingHoursType){
|
|
|
+ String remarks,String id,String abbreviation,String financeId,Integer workingHoursType,Integer hideSign){
|
|
|
Result res = new Result();
|
|
|
if(StringUtils.isBlank(name) || StringUtils.isBlank(type)
|
|
|
|| StringUtils.isBlank(managerId)|| StringUtils.isBlank(superId)
|
|
|
@@ -102,7 +103,7 @@ public class AdminOrganizationController extends BaseApiController{
|
|
|
}
|
|
|
|
|
|
int i=organizationService.updateOrganization(name, type, managerId, superId, status, province,remarks,id,
|
|
|
- sdepNo,count,abbreviation,financeId,workingHoursType);
|
|
|
+ sdepNo,count,abbreviation,financeId,workingHoursType,hideSign);
|
|
|
return res.data(i);
|
|
|
}
|
|
|
|