|
@@ -369,16 +369,16 @@ public class ApiController {
|
|
|
.eq(WmTaskContentConfig::getTaskTypeId, taskTypeId)
|
|
|
.orderByAsc(WmTaskContentConfig::getSeq));
|
|
|
|
|
|
-
|
|
|
+ listConfig.forEach(config -> config.setTaskFiledType(config.getTaskFiledType().trim()));
|
|
|
|
|
|
HnqzUser user = SecurityUtils.getUser();
|
|
|
for (WmTaskContentConfig config : listConfig) {
|
|
|
- if ("select".equals(config.getTaskFiledType().trim())) {
|
|
|
+ if ("select".equals(config.getTaskFiledType())) {
|
|
|
List<SysDictItem> dictItems = sysDictItemService.list(Wrappers.<SysDictItem>lambdaQuery().eq(SysDictItem::getType, config.getDictGroupName()));
|
|
|
dictMap.put(config.getDictGroupName(), dictItems);
|
|
|
}
|
|
|
|
|
|
- if ("domain".equals(config.getTaskFiledType().trim())) {
|
|
|
+ if ("domain".equals(config.getTaskFiledType())) {
|
|
|
if ("ent_service".equals(config.getDictGroupName())) {
|
|
|
List<WmDaDrugEnt> wmDaDrugEnts = Objects.isNull(user) ? wmDaDrugEntService.list() : getDrugListBySecUser(user.getPlatId());
|
|
|
|