github/cosin
1
0
Fork 0
mirror of https://github.com/chatopera/cosin.git synced 2025-07-11 20:17:03 +08:00
Code Issues Releases Wiki Activity

Merge pull request #963 from lecjy/feature/956

Browse Source 
fix #956 https://github.com/cskefu/cskefu/issues/956
This commit is contained in:
Hai Liang W 2023-11-05 11:53:28 +08:00 committed by GitHub
commit cb3a9e14e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contact-center/app/src/main/java/com/cskefu/cc/controller/api/ApiContactsController.java
View File

@ -46,6 +46,8 @@ import org.springframework.web.bind.annotation.RestController;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import jakarta.validation.Valid; import jakarta.validation.Valid;
import java.util.Arrays;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
@ -84,7 +86,7 @@ public class ApiContactsController extends Handler {
if (!StringUtils.isBlank(creater)) { if (!StringUtils.isBlank(creater)) {
User user = super.getUser(request); User user = super.getUser(request);
contactsList = contactsRepository.findByCreaterAndSharesAndDatastatus(user.getId(), "all", false, contactsList = contactsRepository.findByCreaterAndSharesInAndDatastatus(user.getId(), Arrays.asList(user.getId(),"all"), false,
PageRequest.of( PageRequest.of(
super.getP(request), super.getP(request),
super.getPs(request))); super.getPs(request)));

24
contact-center/app/src/main/java/com/cskefu/cc/controller/apps/ContactsController.java
View File

@ -146,8 +146,8 @@ public class ContactsController extends Handler {
map.put("ckind", ckind); map.put("ckind", ckind);
} }
Page<Contacts> contacts = contactsRes.findByCreaterAndSharesAndDatastatus(logined.getId(), Page<Contacts> contacts = contactsRes.findByCreaterAndSharesInAndDatastatus(logined.getId(),
logined.getId(), Arrays.asList(logined.getId(),"all"),
false, false,
PageRequest.of( PageRequest.of(
super.getP(request), super.getP(request),
@ -180,8 +180,8 @@ public class ContactsController extends Handler {
map.put("ckind", ckind); map.put("ckind", ckind);
} }
Page<Contacts> contacts = contactsRes.findByCreaterAndSharesAndDatastatus(logined.getId(), Page<Contacts> contacts = contactsRes.findByCreaterAndSharesInAndDatastatus(logined.getId(),
logined.getId(), Arrays.asList(logined.getId(),"all"),
false, false,
PageRequest.of( PageRequest.of(
super.getP(request), super.getP(request),
@ -214,8 +214,8 @@ public class ContactsController extends Handler {
map.put("ckind", ckind); map.put("ckind", ckind);
} }
Page<Contacts> contacts = contactsRes.findByCreaterAndSharesAndDatastatus(logined.getId(), Page<Contacts> contacts = contactsRes.findByCreaterAndSharesInAndDatastatus(logined.getId(),
logined.getId(), Arrays.asList(logined.getId(),"all"),
false, false,
PageRequest.of( PageRequest.of(
super.getP(request), super.getP(request),
@ -484,8 +484,8 @@ public class ContactsController extends Handler {
map.put("ckind", ckind); map.put("ckind", ckind);
} }
Iterable<Contacts> contactsList = contactsRes.findByCreaterAndSharesAndDatastatus( Iterable<Contacts> contactsList = contactsRes.findByCreaterAndSharesInAndDatastatus(
logined.getId(), logined.getId(), false, PageRequest.of(super.getP(request), super.getPs(request))); logined.getId(), Arrays.asList(logined.getId(),"all"),false, PageRequest.of(super.getP(request), super.getPs(request)));
MetadataTable table = metadataRes.findByTablename("uk_contacts"); MetadataTable table = metadataRes.findByTablename("uk_contacts");
List<Map<String, Object>> values = new ArrayList<>(); List<Map<String, Object>> values = new ArrayList<>();
@ -518,8 +518,8 @@ public class ContactsController extends Handler {
map.put("ckind", ckind); map.put("ckind", ckind);
} }
Iterable<Contacts> contactsList = contactsRes.findByCreaterAndSharesAndDatastatus( Iterable<Contacts> contactsList = contactsRes.findByCreaterAndSharesInAndDatastatus(
logined.getId(), logined.getId(), false, PageRequest.of(super.getP(request), super.getPs(request))); logined.getId(), Arrays.asList(logined.getId(),"all"), false, PageRequest.of(super.getP(request), super.getPs(request)));
MetadataTable table = metadataRes.findByTablename("uk_contacts"); MetadataTable table = metadataRes.findByTablename("uk_contacts");
List<Map<String, Object>> values = new ArrayList<>(); List<Map<String, Object>> values = new ArrayList<>();
for (Contacts contacts : contactsList) { for (Contacts contacts : contactsList) {
@ -558,8 +558,8 @@ public class ContactsController extends Handler {
if (StringUtils.isNotBlank(agentserviceid)) { if (StringUtils.isNotBlank(agentserviceid)) {
AgentService service = agentServiceRes.findById(agentserviceid).orElse(null); AgentService service = agentServiceRes.findById(agentserviceid).orElse(null);
} }
Page<Contacts> contactsList = contactsRes.findByCreaterAndSharesAndDatastatus( Page<Contacts> contactsList = contactsRes.findByCreaterAndSharesInAndDatastatus(
logined.getId(), logined.getId(), false, logined.getId(), Arrays.asList(logined.getId(),"all"), false,
PageRequest.of(super.getP(request), super.getPs(request))); PageRequest.of(super.getP(request), super.getPs(request)));
map.addAttribute("contactsList", contactsList); map.addAttribute("contactsList", contactsList);

4
contact-center/app/src/main/java/com/cskefu/cc/controller/resource/ContactsResourceController.java
View File

@ -31,6 +31,8 @@ import org.springframework.web.bind.annotation.ResponseBody;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import jakarta.validation.Valid; import jakarta.validation.Valid;
import java.util.Arrays;
@Controller @Controller
public class ContactsResourceController extends Handler { public class ContactsResourceController extends Handler {
@ -44,7 +46,7 @@ public class ContactsResourceController extends Handler {
if (q == null) { if (q == null) {
q = ""; q = "";
} }
Page<Contacts> contactsList = contactsRes.findByCreaterAndSharesAndDatastatus(super.getUser(request).getId(), super.getUser(request).getId(), false, PageRequest.of(0, 10)); Page<Contacts> contactsList = contactsRes.findByCreaterAndSharesInAndDatastatus(super.getUser(request).getId(), Arrays.asList(super.getUser(request).getId(),"all"),false, PageRequest.of(0, 10));
JSONArray result = new JSONArray(); JSONArray result = new JSONArray();
for (Contacts contact : contactsList.getContent()) { for (Contacts contact : contactsList.getContent()) {

2
contact-center/app/src/main/java/com/cskefu/cc/persistence/repository/ContactsRepository.java
View File

@ -40,7 +40,7 @@ public interface ContactsRepository extends JpaRepository<Contacts, String> {
@Query(nativeQuery = true, value = "SELECT * FROM uk_contacts WHERE id = ?1") @Query(nativeQuery = true, value = "SELECT * FROM uk_contacts WHERE id = ?1")
Optional<Contacts> findOneById(final String id); Optional<Contacts> findOneById(final String id);
Page<Contacts> findByCreaterAndSharesAndDatastatus(String id, String shares, boolean datastatus, Pageable pageRequest); Page<Contacts> findByCreaterAndSharesInAndDatastatus(String id, Collection<String> shares, boolean datastatus, Pageable pageRequest);
/** /**
* 根据条件返回联系人，符合一下条件之一： * 根据条件返回联系人，符合一下条件之一：

1
contact-center/app/src/main/resources/templates/apps/agent/calloutcontact/add.pug
View File

@ -24,7 +24,6 @@ html
h1.site-h1(style='background-color:#FFFFFF;') 新建联系人 h1.site-h1(style='background-color:#FFFFFF;') 新建联系人
form.layui-form(action='/agent/calloutcontact/save.html?agentuser=${curagentuser.id!\'\'}', method='post') form.layui-form(action='/agent/calloutcontact/save.html?agentuser=${curagentuser.id!\'\'}', method='post')
input(hidden, name='calloutcontact') input(hidden, name='calloutcontact')
input(type='hidden', name='shares', value='all')
.layui-collapse .layui-collapse
.layui-colla-item .layui-colla-item
h2.layui-colla-title 基本信息 h2.layui-colla-title 基本信息

1
contact-center/app/src/main/resources/templates/apps/agent/calloutcontact/edit.pug
View File

@ -23,7 +23,6 @@ html
h1.site-h1(style='background-color:#FFFFFF;') 编辑联系人 h1.site-h1(style='background-color:#FFFFFF;') 编辑联系人
form.layui-form(action='/agent/calloutcontact/update.html', method='post') form.layui-form(action='/agent/calloutcontact/update.html', method='post')
input(type='hidden', name='id', value='${contacts.id!\'\'}') input(type='hidden', name='id', value='${contacts.id!\'\'}')
input(type='hidden', name='shares', value='all')
.layui-collapse .layui-collapse
.layui-colla-item .layui-colla-item
h2.layui-colla-title 基本信息 h2.layui-colla-title 基本信息

1
contact-center/app/src/main/resources/templates/apps/cca/calloutcontact/add.pug
View File

@ -23,7 +23,6 @@ html
h1.site-h1(style='background-color:#FFFFFF;') 新建联系人 h1.site-h1(style='background-color:#FFFFFF;') 新建联系人
form.layui-form(action='/agent/calloutcontact/save.html?agentuser=${curagentuser.id!\'\'}', method='post') form.layui-form(action='/agent/calloutcontact/save.html?agentuser=${curagentuser.id!\'\'}', method='post')
input(hidden, name='calloutcontact') input(hidden, name='calloutcontact')
input(type='hidden', name='shares', value='all')
.layui-collapse .layui-collapse
.layui-colla-item .layui-colla-item
h2.layui-colla-title 基本信息 h2.layui-colla-title 基本信息

1
contact-center/app/src/main/resources/templates/apps/cca/calloutcontact/edit.pug
View File

@ -23,7 +23,6 @@ html
h1.site-h1(style='background-color:#FFFFFF;') 编辑联系人 h1.site-h1(style='background-color:#FFFFFF;') 编辑联系人
form.layui-form(action='/agent/calloutcontact/update.html', method='post') form.layui-form(action='/agent/calloutcontact/update.html', method='post')
input(type='hidden', name='id', value='${contacts.id!\'\'}') input(type='hidden', name='id', value='${contacts.id!\'\'}')
input(type='hidden', name='shares', value='all')
.layui-collapse .layui-collapse
.layui-colla-item .layui-colla-item
h2.layui-colla-title 基本信息 h2.layui-colla-title 基本信息

1
contact-center/app/src/main/resources/templates/apps/contacts/add.pug
View File

@ -13,7 +13,6 @@ include /mixins/dic.mixin.pug
.uk-layui-form .uk-layui-form
form.layui-form(action='/apps/contacts/save.html', method='post') form.layui-form(action='/apps/contacts/save.html', method='post')
input(type='hidden', name='shares', value='all')
.layui-collapse .layui-collapse
.layui-colla-item .layui-colla-item
h2.layui-colla-title 基本信息 h2.layui-colla-title 基本信息

1
contact-center/app/src/main/resources/templates/apps/contacts/edit.pug
View File

@ -21,7 +21,6 @@ include /mixins/dic.mixin.pug
input(type='hidden', name='wlcompany_name', value=contacts.wlcompany_name) input(type='hidden', name='wlcompany_name', value=contacts.wlcompany_name)
input(type='hidden', name='wlsid', value=contacts.wlsid) input(type='hidden', name='wlsid', value=contacts.wlsid)
input(type='hidden', name='wlsystem_name', value=contacts.wlsystem_name) input(type='hidden', name='wlsystem_name', value=contacts.wlsystem_name)
input(type='hidden', name='shares', value='all')
.layui-collapse .layui-collapse
.layui-colla-item .layui-colla-item
h2.layui-colla-title 基本信息 h2.layui-colla-title 基本信息

1
contact-center/app/src/main/resources/templates/apps/contacts/embed/add.pug
View File

@ -13,7 +13,6 @@ include /mixins/dic.mixin.pug
.uk-layui-form .uk-layui-form
form.layui-form(action='/apps/contacts/embed/save.html', data-toggle='ajax-form', data-close='false', data-target='#mainajaxwin', method='post') form.layui-form(action='/apps/contacts/embed/save.html', data-toggle='ajax-form', data-close='false', data-target='#mainajaxwin', method='post')
input(type='hidden', name='agentserviceid', value=agentserviceid) input(type='hidden', name='agentserviceid', value=agentserviceid)
input(type='hidden', name='shares', value='all')
.layui-collapse .layui-collapse
.layui-colla-item .layui-colla-item
h2.layui-colla-title 基本信息 h2.layui-colla-title 基本信息

1
contact-center/app/src/main/resources/templates/apps/contacts/embed/edit.pug
View File

@ -14,7 +14,6 @@ include /mixins/dic.mixin.pug
form.layui-form(action='/apps/contacts/embed/update.html', data-toggle="ajax-form" data-close="false" data-target="#mainajaxwin" method="post") form.layui-form(action='/apps/contacts/embed/update.html', data-toggle="ajax-form" data-close="false" data-target="#mainajaxwin" method="post")
input(type='hidden', name='id', value=contacts.id) input(type='hidden', name='id', value=contacts.id)
input(type='hidden', name='agentserviceid', value=agentserviceid) input(type='hidden', name='agentserviceid', value=agentserviceid)
input(type='hidden', name='shares', value='all')
.layui-collapse .layui-collapse
.layui-colla-item .layui-colla-item
h2.layui-colla-title 基本信息 h2.layui-colla-title 基本信息

1
contact-center/app/src/main/resources/templates/apps/customer/add.pug
View File

@ -14,7 +14,6 @@ include /mixins/dic.mixin.pug
.uk-layui-form .uk-layui-form
form.layui-form(action="/apps/customer/save.html", method="post") form.layui-form(action="/apps/customer/save.html", method="post")
input(type="hidden", name="entcustomer.shares", value="all") input(type="hidden", name="entcustomer.shares", value="all")
input(type="hidden", name="contacts.shares", value="all")
.layui-collapse .layui-collapse
.layui-colla-item .layui-colla-item
h2.layui-colla-title 基本信息 h2.layui-colla-title 基本信息

1
contact-center/app/src/main/resources/templates/apps/customer/edit.pug
View File

@ -16,7 +16,6 @@ include /mixins/dic.mixin.pug
input(type="hidden", name="entcustomer.id", value=account.id) input(type="hidden", name="entcustomer.id", value=account.id)
input(type="hidden", name="ekindId", value=ekindId) input(type="hidden", name="ekindId", value=ekindId)
input(type="hidden", name="entcustomer.shares", value="all") input(type="hidden", name="entcustomer.shares", value="all")
input(type="hidden", name="contacts.shares", value="all")
.layui-collapse .layui-collapse
.layui-colla-item .layui-colla-item
h2.layui-colla-title 基本信息 h2.layui-colla-title 基本信息