|
@@ -53,14 +53,17 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept>
|
|
|
String number;
|
|
String number;
|
|
|
if (comlevel.equals("2")) {
|
|
if (comlevel.equals("2")) {
|
|
|
AssertionUtils.isStringEmpty(sysDept.getProvince(), "二级机构份必填");
|
|
AssertionUtils.isStringEmpty(sysDept.getProvince(), "二级机构份必填");
|
|
|
- number = sysDept.getProvince();
|
|
|
|
|
|
|
+ number = sysDept.getProvince().substring(0, 2);
|
|
|
} else if (comlevel.equals("3")) {
|
|
} else if (comlevel.equals("3")) {
|
|
|
AssertionUtils.isStringEmpty(sysDept.getCity(), "三级机构市必填");
|
|
AssertionUtils.isStringEmpty(sysDept.getCity(), "三级机构市必填");
|
|
|
- number = sysDept.getCity();
|
|
|
|
|
|
|
+ number = sysDept.getCity().substring(0, 4);
|
|
|
} else if (comlevel.equals("4")) {
|
|
} else if (comlevel.equals("4")) {
|
|
|
AssertionUtils.isStringEmpty(sysDept.getArea(), "四级机构区必填");
|
|
AssertionUtils.isStringEmpty(sysDept.getArea(), "四级机构区必填");
|
|
|
- number = sysDept.getArea();
|
|
|
|
|
|
|
+ number = sysDept.getArea().substring(0, 6);
|
|
|
} else {
|
|
} else {
|
|
|
|
|
+ if (comlevel.equals("5")) {
|
|
|
|
|
+ sysDeptVo.setDeptType("M");
|
|
|
|
|
+ }
|
|
|
String maxId = baseMapper.getMaxId(sysDept.getParentId());
|
|
String maxId = baseMapper.getMaxId(sysDept.getParentId());
|
|
|
if (!maxId.equals("0")) {
|
|
if (!maxId.equals("0")) {
|
|
|
String substring = maxId.substring(sysDept.getParentId().length() + 1);
|
|
String substring = maxId.substring(sysDept.getParentId().length() + 1);
|