|
|
@@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
|
|
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import io.seata.spring.annotation.GlobalTransactional;
|
|
|
@@ -179,8 +180,20 @@ public class SalesPolicyServiceImpl extends ServiceImpl<SalesPolicyMapper, Sales
|
|
|
String updateUserIds = "";//修改人id拼接
|
|
|
String createUserIds = "";//创建人id拼接
|
|
|
for (SalesPolicyItem items : specialItemList){
|
|
|
- updateUserIds = updateUserIds + items.getUpdateUser() + ",";
|
|
|
- createUserIds = createUserIds + items.getCreateUser() + ",";
|
|
|
+ if (ObjectUtils.isNotNull(items.getUpdateUser()) && !"null".equals(items.getUpdateUser())) {
|
|
|
+ if (updateUserIds.indexOf(items.getUpdateUser().toString()) == -1) {
|
|
|
+ updateUserIds = updateUserIds + items.getUpdateUser() + ",";
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ }
|
|
|
+ if (ObjectUtils.isNotNull(items.getCreateUser()) && !"null".equals(items.getCreateUser())) {
|
|
|
+ if(createUserIds.indexOf(items.getCreateUser().toString()) == -1){
|
|
|
+ createUserIds = createUserIds + items.getCreateUser() + ",";
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
//获得修改人信息
|
