查询修复
This commit is contained in:
@@ -131,7 +131,7 @@ public class WorkcaseChatContorller {
|
|||||||
|
|
||||||
LoginDomain loginDomain = LoginUtil.getCurrentLogin();
|
LoginDomain loginDomain = LoginUtil.getCurrentLogin();
|
||||||
String userId = loginDomain.getUser().getUserId();
|
String userId = loginDomain.getUser().getUserId();
|
||||||
if(!"guest".equals(loginDomain.getUser().getStatus())){
|
if("guest".equals(loginDomain.getUser().getStatus())){
|
||||||
pageRequest.getFilter().setGuestId(userId);
|
pageRequest.getFilter().setGuestId(userId);
|
||||||
}
|
}
|
||||||
return chatRoomService.getChatRoomPage(pageRequest, userId);
|
return chatRoomService.getChatRoomPage(pageRequest, userId);
|
||||||
|
|||||||
@@ -94,7 +94,7 @@ public class WorkcaseController {
|
|||||||
@PostMapping("/list")
|
@PostMapping("/list")
|
||||||
public ResultDomain<TbWorkcaseDTO> getWorkcaseList(@RequestBody TbWorkcaseDTO filter) {
|
public ResultDomain<TbWorkcaseDTO> getWorkcaseList(@RequestBody TbWorkcaseDTO filter) {
|
||||||
LoginDomain loginDomain = LoginUtil.getCurrentLogin();
|
LoginDomain loginDomain = LoginUtil.getCurrentLogin();
|
||||||
if (!"guest".equals(loginDomain.getUser().getStatus())) {
|
if ("guest".equals(loginDomain.getUser().getStatus())) {
|
||||||
filter.setUserId(loginDomain.getUser().getUserId());
|
filter.setUserId(loginDomain.getUser().getUserId());
|
||||||
}
|
}
|
||||||
return workcaseService.getWorkcaseList(filter);
|
return workcaseService.getWorkcaseList(filter);
|
||||||
|
|||||||
@@ -110,7 +110,7 @@ public class VideoMeetingServiceImpl implements VideoMeetingService {
|
|||||||
List<ChatMemberVO> members = chatRoomMemberMapper.selectChatRoomMemberList(memberFilter);
|
List<ChatMemberVO> members = chatRoomMemberMapper.selectChatRoomMemberList(memberFilter);
|
||||||
|
|
||||||
String userName = loginDomain.getUserInfo().getUsername();
|
String userName = loginDomain.getUserInfo().getUsername();
|
||||||
String userType = !"guest".equals(loginDomain.getUser().getStatus())?"guest":"user";
|
String userType = "guest".equals(loginDomain.getUser().getStatus())?"guest":"user";
|
||||||
if (members != null && !members.isEmpty()) {
|
if (members != null && !members.isEmpty()) {
|
||||||
ChatMemberVO member = members.get(0);
|
ChatMemberVO member = members.get(0);
|
||||||
userName = member.getUserName();
|
userName = member.getUserName();
|
||||||
|
|||||||
@@ -164,9 +164,9 @@
|
|||||||
// 开发环境:使用mock数据
|
// 开发环境:使用mock数据
|
||||||
if (isMockMode.value) {
|
if (isMockMode.value) {
|
||||||
userInfo.value = {
|
userInfo.value = {
|
||||||
wechatId: '17857100378',
|
wechatId: '17857100377',
|
||||||
username: '访客用户',
|
username: '访客用户',
|
||||||
phone: '17857100378',
|
phone: '17857100377',
|
||||||
userId: ''
|
userId: ''
|
||||||
}
|
}
|
||||||
await doIdentify()
|
await doIdentify()
|
||||||
@@ -176,12 +176,12 @@
|
|||||||
// 切换mock用户(开发调试用)
|
// 切换mock用户(开发调试用)
|
||||||
function switchMockUser() {
|
function switchMockUser() {
|
||||||
uni.showActionSheet({
|
uni.showActionSheet({
|
||||||
itemList: ['员工 (17857100375)', '访客 (17857100378)'],
|
itemList: ['员工 (17857100375)', '访客 (17857100377)'],
|
||||||
success: (res) => {
|
success: (res) => {
|
||||||
if (res.tapIndex === 0) {
|
if (res.tapIndex === 0) {
|
||||||
userInfo.value = { wechatId: '17857100375', username: '员工用户', phone: '17857100375', userId: '' }
|
userInfo.value = { wechatId: '17857100375', username: '员工用户', phone: '17857100375', userId: '' }
|
||||||
} else {
|
} else {
|
||||||
userInfo.value = { wechatId: '17857100378', username: '访客用户', phone: '17857100378', userId: '' }
|
userInfo.value = { wechatId: '17857100377', username: '访客用户', phone: '17857100377', userId: '' }
|
||||||
}
|
}
|
||||||
doIdentify()
|
doIdentify()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
{"code":"import '\u0000plugin-vue:export-helper';\nimport 'uni-mp-runtime';\nimport './pages-json-js';\nimport App from './App.uvue';\nimport { createSSRApp } from 'vue';\nexport function createApp() {\n const app = createSSRApp(App);\n return {\n app\n };\n}\n;\ncreateApp().app.mount(\"#app\");\n//# sourceMappingURL=F:/Project/urbanLifeline/urbanLifelineWeb/packages/workcase_wechat/main.uts.js.map","references":["F:/Project/urbanLifeline/urbanLifelineWeb/packages/workcase_wechat/App.uvue.ts","F:/IDE/HBuilderX/plugins/uniapp-cli-vite/node_modules/@vue/runtime-core/dist/runtime-core.d.ts"],"uniExtApis":[],"map":"{\"version\":3,\"file\":\"main.uts.js\",\"sourceRoot\":\"\",\"sources\":[\"main.uts\"],\"names\":[],\"mappings\":\"AAAA,OAAO,2BAA2B,CAAC;AAAA,OAAO,gBAAgB,CAAC;AAAA,OAAO,iBAAiB,CAAC;AAAA,OAAO,GAAG,MAAM,YAAY,CAAA;AAEhH,OAAO,EAAE,YAAY,EAAE,MAAM,KAAK,CAAA;AAClC,MAAM,UAAU,SAAS;IACxB,MAAM,GAAG,GAAG,YAAY,CAAC,GAAG,CAAC,CAAA;IAC7B,OAAO;QACN,GAAG;KACH,CAAA;AACF,CAAC;AAAA,CAAC;AACF,SAAS,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC\"}"}
|
|
||||||
Reference in New Issue
Block a user