Commit 275cbff4 authored by huangjie's avatar huangjie

Merge branch 'dev20230707' of http://192.168.60.201/root/dsk-operate-sys into dev20230707

parents ac2303a6 dd169a86
...@@ -30,7 +30,7 @@ public class EnterpriseBussinessSupplierProjectPageBody extends BasePage { ...@@ -30,7 +30,7 @@ public class EnterpriseBussinessSupplierProjectPageBody extends BasePage {
* 供应商企业 * 供应商企业
*/ */
@NotNull(message = "企业不能为空") @NotNull(message = "企业不能为空")
private Integer companyName; private String companyName;
/** /**
* 查询关键字 * 查询关键字
......
package com.dsk.system.domain.business.dto; package com.dsk.system.domain.business.dto;
import com.dsk.common.core.domain.BaseEntity;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
...@@ -14,7 +15,7 @@ import java.util.Map; ...@@ -14,7 +15,7 @@ import java.util.Map;
*/ */
@Data @Data
@NoArgsConstructor @NoArgsConstructor
public class BusinessSearchDto implements Serializable { public class BusinessSearchDto extends BaseEntity implements Serializable {
/** /**
* 用户id * 用户id
*/ */
...@@ -24,18 +25,6 @@ public class BusinessSearchDto implements Serializable { ...@@ -24,18 +25,6 @@ public class BusinessSearchDto implements Serializable {
*/ */
private Integer status; private Integer status;
/**
* 数据权限
*/
private Map<String, Object> params;
public Map<String, Object> getParams() {
if (params == null) {
params = new HashMap<>();
}
return params;
}
public BusinessSearchDto(Long userId) { public BusinessSearchDto(Long userId) {
this.userId = userId; this.userId = userId;
} }
......
package com.dsk.system.domain.customer.dto; package com.dsk.system.domain.customer.dto;
import com.dsk.common.core.domain.BaseEntity;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
...@@ -14,7 +15,7 @@ import java.util.Map; ...@@ -14,7 +15,7 @@ import java.util.Map;
*/ */
@Data @Data
@NoArgsConstructor @NoArgsConstructor
public class CustomerSearchDto implements Serializable { public class CustomerSearchDto extends BaseEntity implements Serializable {
/** /**
* 企业id * 企业id
*/ */
...@@ -67,17 +68,4 @@ public class CustomerSearchDto implements Serializable { ...@@ -67,17 +68,4 @@ public class CustomerSearchDto implements Serializable {
* 信资等级 * 信资等级
*/ */
private List<String> creditLevels; private List<String> creditLevels;
/**
* 数据权限
*/
private Map<String, Object> params;
public Map<String, Object> getParams() {
if (params == null) {
params = new HashMap<>();
}
return params;
}
} }
...@@ -71,11 +71,11 @@ ...@@ -71,11 +71,11 @@
left join sys_dept d on u.dept_id = d.dept_id left join sys_dept d on u.dept_id = d.dept_id
<where> <where>
<if test="userId != null"> and (f.user_id = #{userId} or i.is_private = 1)</if> <if test="userId != null"> and (f.user_id = #{userId} or i.is_private = 1)</if>
<if test="startTime != null and startTime != '' "> and f.creat_time &gt;= #{startTime} </if> <if test="startTime != null and startTime != '' "> and f.visit_time &gt;= #{startTime} </if>
<if test="endTime != null and endTime != '' "> and f.creat_time &lt;= #{endTime} </if> <if test="endTime != null and endTime != '' "> and f.visit_time &lt;= #{endTime} </if>
${params.dataScope} ${params.dataScope}
</where> </where>
ORDER BY f.creat_time DESC ORDER BY f.visit_time DESC
</select> </select>
<select id="selectRelateProject" resultType="com.dsk.system.domain.business.vo.BusinessListVo"> <select id="selectRelateProject" resultType="com.dsk.system.domain.business.vo.BusinessListVo">
select i.id,i.project_name as projectName select i.id,i.project_name as projectName
......
...@@ -314,10 +314,9 @@ ...@@ -314,10 +314,9 @@
</delete> </delete>
<delete id="deleteBusinessInfoByIds" parameterType="Long"> <delete id="deleteBusinessInfoByIds" parameterType="Long">
delete i,b,co,f,l,r,u delete i,b,f,l,r,u
from business_info i from business_info i
left join business_backlog b on b.business_id = i.id left join business_backlog b on b.business_id = i.id
left join business_contacts co on co.business_id = i.id
left join business_follow_record f on f.business_id = i.id left join business_follow_record f on f.business_id = i.id
left join business_label l on l.business_id = i.id left join business_label l on l.business_id = i.id
left join business_relate_company r on r.business_id = i.id left join business_relate_company r on r.business_id = i.id
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<!-- 数据范围过滤 --> <!-- 数据范围过滤 -->
<if test="params.dataScope != null and params.dataScope != '' "> ${params.dataScope} </if> <if test="params.dataScope != null and params.dataScope != '' "> ${params.dataScope} </if>
</where> </where>
order by cfr.create_time desc order by cfr.visit_time desc
</select> </select>
</mapper> </mapper>
......
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