|
|
@@ -28,7 +28,7 @@ public class AdminOrganizationController extends BaseApiController{
|
|
|
Integer pageSize){
|
|
|
Result res = new Result();
|
|
|
res.setData(organizationService.listOrganizationManagement(olo, pageNo, pageSize));
|
|
|
- return res;
|
|
|
+ return res;
|
|
|
}
|
|
|
/**部门组织管理上级组织查询 **/
|
|
|
@RequestMapping(value = "/selectSuperId" , method = RequestMethod.GET)
|
|
|
@@ -41,7 +41,7 @@ public class AdminOrganizationController extends BaseApiController{
|
|
|
@RequestMapping(value = "/selectSuperIdS" , method = RequestMethod.GET)
|
|
|
public Result selectsuperIdS(){
|
|
|
Result res = new Result();
|
|
|
-
|
|
|
+
|
|
|
res.setData(organizationService.selectSuperId(1));
|
|
|
return res;
|
|
|
}
|
|
|
@@ -57,7 +57,7 @@ public class AdminOrganizationController extends BaseApiController{
|
|
|
if(olo!=null){
|
|
|
res.getError().add(buildError("","部门已存在"));
|
|
|
return res;
|
|
|
- }
|
|
|
+ }
|
|
|
String sdepNo=organizationManagementMapper.selectDepNo(superId);
|
|
|
int Count=organizationManagementMapper.selectDepNoCount(superId);
|
|
|
if((Count+1)>99){
|
|
|
@@ -68,13 +68,13 @@ public class AdminOrganizationController extends BaseApiController{
|
|
|
String dep=sdepNo+"0"+Count;
|
|
|
String sid=organizationManagementMapper.selectIdByDepNo(dep);
|
|
|
while(sid!=null){
|
|
|
- Count=(Count+1)%100;
|
|
|
+ Count=(Count+1)%100;
|
|
|
if(Count>=10){
|
|
|
- dep=sdepNo+Count;
|
|
|
+ dep=sdepNo+Count;
|
|
|
}else{
|
|
|
dep=sdepNo+"0"+Count;
|
|
|
}
|
|
|
- sid=organizationManagementMapper.selectIdByDepNo(dep);
|
|
|
+ sid=organizationManagementMapper.selectIdByDepNo(dep);
|
|
|
}
|
|
|
organizationService.addOrganization(name, managerId, type, superId, remarks,dep,workingHoursType);
|
|
|
}
|
|
|
@@ -82,13 +82,13 @@ public class AdminOrganizationController extends BaseApiController{
|
|
|
String dep=sdepNo+Count;
|
|
|
String sid=organizationManagementMapper.selectIdByDepNo(dep);
|
|
|
while(sid!=null){
|
|
|
- Count=(Count+1)%100;
|
|
|
+ Count=(Count+1)%100;
|
|
|
dep=sdepNo+Count;
|
|
|
- sid=organizationManagementMapper.selectIdByDepNo(dep);
|
|
|
+ sid=organizationManagementMapper.selectIdByDepNo(dep);
|
|
|
}
|
|
|
organizationService.addOrganization(name, managerId, type, superId, remarks,dep,workingHoursType);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
return res;
|
|
|
}
|
|
|
/**负责人自动补全查询**/
|
|
|
@@ -115,7 +115,7 @@ public class AdminOrganizationController extends BaseApiController{
|
|
|
|| StringUtils.isBlank(status)|| StringUtils.isBlank(remarks)){
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR,""));
|
|
|
return res;
|
|
|
- }
|
|
|
+ }
|
|
|
String sdepNo=organizationManagementMapper.selectDepNo(superId);//No
|
|
|
int Count=organizationManagementMapper.selectDepNoCount(superId);//14
|
|
|
if((Count+1)>99){
|
|
|
@@ -127,31 +127,30 @@ public class AdminOrganizationController extends BaseApiController{
|
|
|
String dep=sdepNo+"0"+Count;
|
|
|
String sid=organizationManagementMapper.selectIdByDepNo(dep);
|
|
|
while(sid!=null){
|
|
|
- Count=(Count+1)%100;
|
|
|
+ Count=(Count+1)%100;
|
|
|
if(Count>=10){
|
|
|
- dep=sdepNo+Count;
|
|
|
+ dep=sdepNo+Count;
|
|
|
}else{
|
|
|
dep=sdepNo+"0"+Count;
|
|
|
}
|
|
|
- sid=organizationManagementMapper.selectIdByDepNo(dep);
|
|
|
+ sid=organizationManagementMapper.selectIdByDepNo(dep);
|
|
|
}
|
|
|
i=organizationService.updateOrganization(name, type, managerId, superId, status, province,remarks,id,dep,abbreviation,financeId,workingHoursType);
|
|
|
- }
|
|
|
- if(Count>=10){
|
|
|
+ }else if(Count>=10){
|
|
|
String dep=sdepNo+Count;
|
|
|
String sid=organizationManagementMapper.selectIdByDepNo(dep);
|
|
|
while(sid!=null){
|
|
|
- Count=(Count+1)%100;
|
|
|
+ Count=(Count+1)%100;
|
|
|
dep=sdepNo+Count;
|
|
|
- sid=organizationManagementMapper.selectIdByDepNo(dep);
|
|
|
+ sid=organizationManagementMapper.selectIdByDepNo(dep);
|
|
|
}
|
|
|
i=organizationService.updateOrganization(name, type, managerId, superId, status, province,remarks,id,dep,abbreviation,financeId,workingHoursType);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
return res.data(i);
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
/**删除列表信息**/
|
|
|
@RequestMapping(value = "/deleteById" , method = RequestMethod.POST)
|
|
|
public Result deleteById(String id){
|
|
|
@@ -175,5 +174,5 @@ public class AdminOrganizationController extends BaseApiController{
|
|
|
organizationService.deleteById(id);
|
|
|
return res;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
}
|