Merge remote-tracking branch 'origin/master' into prod

authorize-api-service/src/main/java/com/xy/service/impl/SysDeptServiceImpl.java

@@ -96,6 +96,11 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
             if (CollUtil.isNotEmpty(roleIds)) {
                 sysDeptRoleService.updateDeptRole(sysDept.getId(), roleIds, sysDeptDto.getSysId());
             }
+            if (roleIds != null && roleIds.size() == 0) {
+                // 部门角色清理
+                sysDeptRoleService.removeDeptRoleById(sysDept.getId());
+
+            }
         }
         return R.ok(saveOrUpdate(sysDept));
     }
@@ -160,6 +165,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
                     // 扩展属性
                     Map<String, Object> extra = new HashMap<>();
                     extra.put(LambdaUtils.getProperty(SysDept::getCreateTime), dept.getCreateTime());
+                    extra.put(LambdaUtils.getProperty(SysDept::getUpdateTime), dept.getUpdateTime());
                     extra.put(LambdaUtils.getProperty(SysDept::getCode), dept.getCode());
                     // 部门角色
                     List<SysDeptRole> sysDeptRoles = sysDeptRoleService.list(Wrappers.<SysDeptRole>lambdaQuery().in(SysDeptRole::getDeptId, dept.getId()));