Jelajahi Sumber

政策-操作记录时间提示

yangzian 3 tahun lalu
induk
melakukan
353915bf1d

+ 1 - 1
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/controller/CwjsPolicyInfoController.java

@@ -383,7 +383,7 @@ public class CwjsPolicyInfoController {
         //查询政策
 		List<CwjsPolicyInfo> cwjsPolicyInfoList = cwjsPolicyInfoService.queryPageList(cwjsPolicyInfo);
 		if(Check.isNull(cwjsPolicyInfoList)){
-			return Result.errorMsg("没有符合条件的政策,请重新选择。");
+			return Result.errorMsg("暂无政策。");
 		}
 		//时间 降序
 		Collections.sort(cwjsPolicyInfoList, Comparator.comparing(CwjsPolicyInfo::getCreateTime).reversed());

+ 1 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/controller/CwjsSaleAssistantInfoController.java

@@ -76,6 +76,7 @@ public class CwjsSaleAssistantInfoController {
 															  HttpServletRequest req) {
 		Result<IPage<CwjsSaleAssistantInfo>> result = new Result<>();
 		QueryWrapper<CwjsSaleAssistantInfo> queryWrapper = QueryGenerator.initQueryWrapper(cwjsSaleAssistantInfo, req.getParameterMap());
+		queryWrapper.eq("del_flag", 0);
 		queryWrapper.orderByDesc("update_time");
 		Page<CwjsSaleAssistantInfo> page = new Page<CwjsSaleAssistantInfo>(pageNo, pageSize);
 		IPage<CwjsSaleAssistantInfo> pageList = cwjsSaleAssistantInfoService.page(page, queryWrapper);

+ 1 - 1
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/mapper/xml/CwjsPolicyInfoMapper.xml

@@ -381,7 +381,7 @@
                         END AS approvalContent,
                     IF(p.approved_status = 4 , p.create_user_id, p.approved_progress ) userId,
                     p.create_user_name,
-                    NOW() createTime
+                    '' createTime
                 FROM
                     ctop_cwjs_policy_info p
                 WHERE