|
|
@@ -16,7 +16,7 @@ import com.goafanti.organization.bo.OrganizationListOut;
|
|
|
import com.goafanti.organization.service.OrganizationService;
|
|
|
|
|
|
@RestController
|
|
|
-@RequestMapping("api/admin/organization")
|
|
|
+@RequestMapping("open/api/admin/organization")
|
|
|
public class AdminOrganizationController extends BaseApiController{
|
|
|
@Resource
|
|
|
private OrganizationService organizationService;
|
|
|
@@ -41,8 +41,7 @@ public class AdminOrganizationController extends BaseApiController{
|
|
|
@RequestMapping(value = "/addOrganization" , method = RequestMethod.POST)
|
|
|
public Result addOrganization(String name, String managerId, String type, String superId, String remarks) throws Exception{
|
|
|
Result res = new Result();
|
|
|
- if(StringUtils.isBlank(name) || StringUtils.isBlank(type)
|
|
|
- || StringUtils.isBlank(superId)){
|
|
|
+ if(StringUtils.isBlank(name) || StringUtils.isBlank(type) || StringUtils.isBlank(superId)){
|
|
|
res.getError().add(buildError("","组织名称、组织类型、上级组织不能为空"));
|
|
|
return res;
|
|
|
}
|
|
|
@@ -51,7 +50,7 @@ public class AdminOrganizationController extends BaseApiController{
|
|
|
res.getError().add(buildError("","部门已存在"));
|
|
|
return res;
|
|
|
}
|
|
|
- String sdepNo=organizationManagementMapper.selectDepNoByName(superId);
|
|
|
+ String sdepNo=organizationManagementMapper.selectDepNo(superId);
|
|
|
int Count=organizationManagementMapper.selectDepNoCount(superId);
|
|
|
if((Count+1)>99){
|
|
|
res.getError().add(buildError("","每层最多存在99个子类"));
|
|
|
@@ -108,8 +107,9 @@ public class AdminOrganizationController extends BaseApiController{
|
|
|
res.getError().add(buildError(ErrorConstants.PARAM_ERROR,""));
|
|
|
return res;
|
|
|
}
|
|
|
- String sdepNo=organizationManagementMapper.selectDepNoByName(superId);
|
|
|
- superId=organizationManagementMapper.selectIdByName(superId);
|
|
|
+ String sdepNo=organizationManagementMapper.selectDepNo(superId);
|
|
|
+ /* String sdepNo=organizationManagementMapper.selectDepNoByName(superId);*/
|
|
|
+ /*superId=organizationManagementMapper.selectIdByName(superId);*/
|
|
|
int Count=organizationManagementMapper.selectDepNoCount(superId);
|
|
|
if((Count+1)>99){
|
|
|
res.getError().add(buildError("","每层最多存在99个子类"));
|