Commit 6469e966 authored by cq990612's avatar cq990612

优化代码结构

parent f0803fea
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
</facet> </facet>
</component> </component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8"> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://D:/Repository/ideaRepository/org/springframework/boot/spring-boot-starter-parent/2.1.5.RELEASE/target/classes" /> <output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://D:/Repository/ideaRepository/org/springframework/boot/spring-boot-starter-parent/2.1.5.RELEASE/target/test-classes" /> <output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/target" /> <excludeFolder url="file://$MODULE_DIR$/target" />
......
...@@ -58,7 +58,6 @@ public class WorkProjectChange implements Serializable { ...@@ -58,7 +58,6 @@ public class WorkProjectChange implements Serializable {
@ApiModelProperty(name = "operationType",value = "1:新增 2:修改 3:结项") @ApiModelProperty(name = "operationType",value = "1:新增 2:修改 3:结项")
private Integer operationType; private Integer operationType;
/** 附加字段 更变项名 变更人姓名*/ /** 附加字段 更变项名 变更人姓名*/
@TableField(exist = false) @TableField(exist = false)
private String changeTypeName; private String changeTypeName;
......
...@@ -696,14 +696,11 @@ public class WorkProjectServiceImpl implements WorkProjectService { ...@@ -696,14 +696,11 @@ public class WorkProjectServiceImpl implements WorkProjectService {
} }
} }
if (!(userIds.containsAll(modifyProjectVo.getUserIds()) && if (!(userIds.containsAll(modifyProjectVo.getUserIds()) &&
modifyProjectVo.getUserIds().containsAll(userIds))) { modifyProjectVo.getUserIds().containsAll(userIds))) {
if (StringUtils.isBlank(modifyProjectVo.getUserIdsReason())) { if (StringUtils.isBlank(modifyProjectVo.getUserIdsReason())) {
throw new BaseCustomException(BASE_RESP_CODE_ENUM.REASON_CANNOT_BE_EMPTY); throw new BaseCustomException(BASE_RESP_CODE_ENUM.REASON_CANNOT_BE_EMPTY);
} }
} }
} }
} }
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