阶段提交

src/main/java/com/usky/controller/sys/DeptController.java

@@ -98,6 +98,19 @@ public class DeptController {
         if (null != dept.getOrderNum()) {
             deptDTO.setOrderNum(dept.getOrderNum());
         }
+        if (StringUtils.isNotBlank(dept.getDeptName())) {
+            deptDTO.setDeptName(dept.getDeptName());
+        }
+        if (StringUtils.isNotBlank(dept.getPhone())) {
+            deptDTO.setPhone(dept.getPhone());
+        }
+        if (StringUtils.isNotBlank(dept.getEmail())) {
+            deptDTO.setEmail(dept.getEmail());
+        }
+        if (StringUtils.isNotBlank(dept.getLeader())) {
+            deptDTO.setLeader(dept.getLeader());
+        }
+
         deptDTO.setDeptId(dept.getDeptId());
         deptDTO.setStatus(dept.getStatus());
         deptDTO.setUpdateBy(ShiroUtils.getSysUserVo().getLoginName());

src/main/java/com/usky/service/sys/RoleServiceImpl.java

@@ -146,6 +146,7 @@ public class RoleServiceImpl extends BaseDaoImpl implements RoleService {
         if (StringUtils.isNotBlank(roleVO.getStatus())) {
             roleDTO.setStatus(roleVO.getStatus());
         }
+        roleDTO.setDataScope(roleVO.getDataScope());
         roleDTO.setRoleSort(roleVO.getRoleSort());
         roleDTO.setUpdateBy(ShiroUtils.getLoginName());
         roleDTO.setUpdateTime(new Timestamp(System.currentTimeMillis()));