Commit 1db08d6c by qwmqiuwenmin

fix

parent b10dfab5
...@@ -439,8 +439,8 @@ public class DepartmentContoller extends WebBaseController{ ...@@ -439,8 +439,8 @@ public class DepartmentContoller extends WebBaseController{
public void syncDepartment(String editDepartment,String delDepartmentIds,String addDepartment){ public void syncDepartment(String editDepartment,String delDepartmentIds,String addDepartment){
if(StringUtils.isNotBlank(addDepartment)) { if(StringUtils.isNotBlank(addDepartment)) {
List<DepartmentAddQO> list = JSONArray.parseArray(addDepartment, DepartmentAddQO.class); List<DepartmentAddQO> list = JSONArray.parseArray(addDepartment, DepartmentAddQO.class);
int sort = 0; long sort = 0;
int maxSort = list.size(); long maxSort = list.size();
for (DepartmentAddQO departmentAddQO : list) { for (DepartmentAddQO departmentAddQO : list) {
String parentId = departmentAddQO.getParentId(); String parentId = departmentAddQO.getParentId();
DepartmentDTO dto = departmentApiService.selectById(parentId); DepartmentDTO dto = departmentApiService.selectById(parentId);
...@@ -494,8 +494,8 @@ public class DepartmentContoller extends WebBaseController{ ...@@ -494,8 +494,8 @@ public class DepartmentContoller extends WebBaseController{
logger.info("【部门修改】editDepartment={}",editDepartment); logger.info("【部门修改】editDepartment={}",editDepartment);
if(StringUtils.isNotBlank(editDepartment)) { if(StringUtils.isNotBlank(editDepartment)) {
List<DepartmentEditQO> list = JSONArray.parseArray(editDepartment, DepartmentEditQO.class); List<DepartmentEditQO> list = JSONArray.parseArray(editDepartment, DepartmentEditQO.class);
int sort = 0; long sort = 0;
int maxSort = list.size(); long maxSort = list.size();
logger.info("【部门修改】list={}",JSON.toJSONString(list)); logger.info("【部门修改】list={}",JSON.toJSONString(list));
for (DepartmentEditQO departmentQO : list) { for (DepartmentEditQO departmentQO : list) {
String parentId = departmentQO.getParentId(); String parentId = departmentQO.getParentId();
...@@ -641,8 +641,8 @@ public class DepartmentContoller extends WebBaseController{ ...@@ -641,8 +641,8 @@ public class DepartmentContoller extends WebBaseController{
logger.info("【处理子节点】sonDepartment={},parentId={}",sonDepartment,parentId); logger.info("【处理子节点】sonDepartment={},parentId={}",sonDepartment,parentId);
if(StringUtils.isNotBlank(sonDepartment)) { if(StringUtils.isNotBlank(sonDepartment)) {
List<DepartmentAddQO> list = JSONArray.parseArray(sonDepartment, DepartmentAddQO.class); List<DepartmentAddQO> list = JSONArray.parseArray(sonDepartment, DepartmentAddQO.class);
int maxSort = list.size(); long maxSort = list.size();
int sort = 0; long sort = 0;
for (DepartmentAddQO departmentAddQO : list) { for (DepartmentAddQO departmentAddQO : list) {
Integer type = departmentAddQO.getType(); Integer type = departmentAddQO.getType();
Integer isStore = 0; Integer isStore = 0;
......
...@@ -20,7 +20,7 @@ public class DepartmentAddQO implements Serializable { ...@@ -20,7 +20,7 @@ public class DepartmentAddQO implements Serializable {
private Boolean addFlag; private Boolean addFlag;
private Integer sort; private Long sort;
private Integer type; private Integer type;
...@@ -59,11 +59,12 @@ public class DepartmentAddQO implements Serializable { ...@@ -59,11 +59,12 @@ public class DepartmentAddQO implements Serializable {
public Integer getSort() {
public Long getSort() {
return sort; return sort;
} }
public void setSort(Integer sort) { public void setSort(Long sort) {
this.sort = sort; this.sort = sort;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment