|
@@ -158,14 +158,14 @@ public class WbsParamController {
|
|
|
for (WbsParamBean b : updateList) {
|
|
|
WbsParam old = this.service.getById(b.getId());
|
|
|
if (pb.isCommon()) {
|
|
|
- if (old != null && !old.getK().equals(b.getK())) {
|
|
|
+ if (old != null && (!old.getV().equals(b.getV())||StringUtils.isNotEquals(old.getRemark(),b.getRemark()))) {
|
|
|
/*只有公式内容变化的时候才需要更新*/
|
|
|
old.setIsDeleted(0);
|
|
|
BeanUtils.copyProperties(b, old);
|
|
|
ul.add(old);
|
|
|
}
|
|
|
} else {
|
|
|
- if (old != null && !old.getV().equals(b.getV())) {
|
|
|
+ if (old != null && (!old.getV().equals(b.getV())||StringUtils.isNotEquals(old.getRemark(),b.getRemark()))) {
|
|
|
/*只有公式内容变化的时候才需要更新*/
|
|
|
old.setIsDeleted(0);
|
|
|
BeanUtils.copyProperties(b, old);
|