Compare commits

..

No commits in common. "8f95374cefb95a49e7a7751f9d8f91f034cb5714" and "529f1e5dbba90edb9e98b50d393749285de73cbd" have entirely different histories.

3 changed files with 9 additions and 12 deletions

View File

@ -77,9 +77,4 @@ public interface SystemConstants {
*/
String ROOT_DEPT_ANCESTORS = "0";
/**
* 默认部门 ID
*/
Long DEFAULT_DEPT_ID = 100L;
}

View File

@ -113,9 +113,6 @@ public class SysDeptController extends BaseController {
@Log(title = "部门管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{deptId}")
public R<Void> remove(@PathVariable Long deptId) {
if (SystemConstants.DEFAULT_DEPT_ID.equals(deptId)) {
return R.warn("默认部门,不允许删除");
}
if (deptService.hasChildByDeptId(deptId)) {
return R.warn("存在下级部门,不允许删除");
}

View File

@ -106,10 +106,15 @@ public class FlwTaskAssigneeServiceImpl implements IFlwTaskAssigneeService, Hand
.map(entry -> {
String storageId = entry.getKey();
Pair<TaskAssigneeEnum, Long> parsed = entry.getValue();
String handlerName = (parsed == null) ? null
: nameMap.getOrDefault(parsed.getKey(), Collections.emptyMap())
.get(parsed.getValue());
return new HandlerFeedBackVo(storageId, handlerName);
String handlerName = "格式错误";
if (parsed != null) {
Map<Long, String> nameMapping = nameMap.getOrDefault(parsed.getKey(), Collections.emptyMap());
handlerName = nameMapping.getOrDefault(parsed.getValue(), "未知名称");
}
HandlerFeedBackVo backVo = new HandlerFeedBackVo();
backVo.setStorageId(storageId);
backVo.setHandlerName(handlerName);
return backVo;
}).toList();
}