diff --git a/urbanLifelineServ/workcase/src/main/java/org/xyzh/workcase/controller/WorkcaseChatContorller.java b/urbanLifelineServ/workcase/src/main/java/org/xyzh/workcase/controller/WorkcaseChatContorller.java index 95f65c63..a1cdec58 100644 --- a/urbanLifelineServ/workcase/src/main/java/org/xyzh/workcase/controller/WorkcaseChatContorller.java +++ b/urbanLifelineServ/workcase/src/main/java/org/xyzh/workcase/controller/WorkcaseChatContorller.java @@ -131,7 +131,7 @@ public class WorkcaseChatContorller { LoginDomain loginDomain = LoginUtil.getCurrentLogin(); String userId = loginDomain.getUser().getUserId(); - if(!"guest".equals(loginDomain.getUser().getStatus())){ + if("guest".equals(loginDomain.getUser().getStatus())){ pageRequest.getFilter().setGuestId(userId); } return chatRoomService.getChatRoomPage(pageRequest, userId); diff --git a/urbanLifelineServ/workcase/src/main/java/org/xyzh/workcase/controller/WorkcaseController.java b/urbanLifelineServ/workcase/src/main/java/org/xyzh/workcase/controller/WorkcaseController.java index 1ff6dc3e..11bd45e2 100644 --- a/urbanLifelineServ/workcase/src/main/java/org/xyzh/workcase/controller/WorkcaseController.java +++ b/urbanLifelineServ/workcase/src/main/java/org/xyzh/workcase/controller/WorkcaseController.java @@ -94,7 +94,7 @@ public class WorkcaseController { @PostMapping("/list") public ResultDomain getWorkcaseList(@RequestBody TbWorkcaseDTO filter) { LoginDomain loginDomain = LoginUtil.getCurrentLogin(); - if (!"guest".equals(loginDomain.getUser().getStatus())) { + if ("guest".equals(loginDomain.getUser().getStatus())) { filter.setUserId(loginDomain.getUser().getUserId()); } return workcaseService.getWorkcaseList(filter); diff --git a/urbanLifelineServ/workcase/src/main/java/org/xyzh/workcase/service/VideoMeetingServiceImpl.java b/urbanLifelineServ/workcase/src/main/java/org/xyzh/workcase/service/VideoMeetingServiceImpl.java index 15fca1c5..128f9056 100644 --- a/urbanLifelineServ/workcase/src/main/java/org/xyzh/workcase/service/VideoMeetingServiceImpl.java +++ b/urbanLifelineServ/workcase/src/main/java/org/xyzh/workcase/service/VideoMeetingServiceImpl.java @@ -110,7 +110,7 @@ public class VideoMeetingServiceImpl implements VideoMeetingService { List members = chatRoomMemberMapper.selectChatRoomMemberList(memberFilter); 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()) { ChatMemberVO member = members.get(0); userName = member.getUserName(); diff --git a/urbanLifelineWeb/packages/workcase_wechat/pages/index/index.uvue b/urbanLifelineWeb/packages/workcase_wechat/pages/index/index.uvue index 16ecd3f4..ec5d8a01 100644 --- a/urbanLifelineWeb/packages/workcase_wechat/pages/index/index.uvue +++ b/urbanLifelineWeb/packages/workcase_wechat/pages/index/index.uvue @@ -164,9 +164,9 @@ // 开发环境：使用mock数据 if (isMockMode.value) { userInfo.value = { - wechatId: '17857100378', + wechatId: '17857100377', username: '访客用户', - phone: '17857100378', + phone: '17857100377', userId: '' } await doIdentify() @@ -176,12 +176,12 @@ // 切换mock用户（开发调试用） function switchMockUser() { uni.showActionSheet({ - itemList: ['员工 (17857100375)', '访客 (17857100378)'], + itemList: ['员工 (17857100375)', '访客 (17857100377)'], success: (res) => { if (res.tapIndex === 0) { userInfo.value = { wechatId: '17857100375', username: '员工用户', phone: '17857100375', userId: '' } } else { - userInfo.value = { wechatId: '17857100378', username: '访客用户', phone: '17857100378', userId: '' } + userInfo.value = { wechatId: '17857100377', username: '访客用户', phone: '17857100377', userId: '' } } doIdentify() } diff --git a/urbanLifelineWeb/packages/workcase_wechat/unpackage/cache/.mp-weixin/.uts2js/cache/uts_9b1b54d07a7a4d66ee84f54872fe1ae86df34bb1/code/cache/2dd4764e94c4ba36784b773ea00fe84ac3965bc3 b/urbanLifelineWeb/packages/workcase_wechat/unpackage/cache/.mp-weixin/.uts2js/cache/uts_9b1b54d07a7a4d66ee84f54872fe1ae86df34bb1/code/cache/2dd4764e94c4ba36784b773ea00fe84ac3965bc3 deleted file mode 100644 index 5babf262..00000000 --- a/urbanLifelineWeb/packages/workcase_wechat/unpackage/cache/.mp-weixin/.uts2js/cache/uts_9b1b54d07a7a4d66ee84f54872fe1ae86df34bb1/code/cache/2dd4764e94c4ba36784b773ea00fe84ac3965bc3 +++ /dev/null @@ -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\"}"} diff --git a/urbanLifelineWeb/packages/workcase_wechat/unpackage/cache/.mp-weixin/.uts2js/cache/uts_9b1b54d07a7a4d66ee84f54872fe1ae86df34bb1/types/cache/245563485d1f525c817c32ca9c24bc772f2c5774 b/urbanLifelineWeb/packages/workcase_wechat/unpackage/cache/.mp-weixin/.uts2js/cache/uts_9b1b54d07a7a4d66ee84f54872fe1ae86df34bb1/types/cache/245563485d1f525c817c32ca9c24bc772f2c5774 deleted file mode 100644 index e69de29b..00000000 diff --git a/urbanLifelineWeb/packages/workcase_wechat/unpackage/cache/.mp-weixin/.uts2js/cache/uts_9b1b54d07a7a4d66ee84f54872fe1ae86df34bb1/types/cache/26a1c9ca3417be2918d045887c9addaa41a2172d b/urbanLifelineWeb/packages/workcase_wechat/unpackage/cache/.mp-weixin/.uts2js/cache/uts_9b1b54d07a7a4d66ee84f54872fe1ae86df34bb1/types/cache/26a1c9ca3417be2918d045887c9addaa41a2172d deleted file mode 100644 index e69de29b..00000000 diff --git a/urbanLifelineWeb/packages/workcase_wechat/unpackage/cache/.mp-weixin/.uts2js/cache/uts_9b1b54d07a7a4d66ee84f54872fe1ae86df34bb1/types/cache/549c121a7e54517a64e2fe6b4a44fc4ae369a02a b/urbanLifelineWeb/packages/workcase_wechat/unpackage/cache/.mp-weixin/.uts2js/cache/uts_9b1b54d07a7a4d66ee84f54872fe1ae86df34bb1/types/cache/549c121a7e54517a64e2fe6b4a44fc4ae369a02a deleted file mode 100644 index e69de29b..00000000 diff --git a/urbanLifelineWeb/packages/workcase_wechat/unpackage/cache/.mp-weixin/.uts2js/cache/uts_9b1b54d07a7a4d66ee84f54872fe1ae86df34bb1/types/cache/5666a8a165d006dd091c627f0a3e93560bcaf8f6 b/urbanLifelineWeb/packages/workcase_wechat/unpackage/cache/.mp-weixin/.uts2js/cache/uts_9b1b54d07a7a4d66ee84f54872fe1ae86df34bb1/types/cache/5666a8a165d006dd091c627f0a3e93560bcaf8f6 deleted file mode 100644 index e69de29b..00000000 diff --git a/urbanLifelineWeb/packages/workcase_wechat/unpackage/cache/.mp-weixin/.uts2js/cache/uts_9b1b54d07a7a4d66ee84f54872fe1ae86df34bb1/types/cache/982f43a85bdaacde2e16218df6604722ae9e7910 b/urbanLifelineWeb/packages/workcase_wechat/unpackage/cache/.mp-weixin/.uts2js/cache/uts_9b1b54d07a7a4d66ee84f54872fe1ae86df34bb1/types/cache/982f43a85bdaacde2e16218df6604722ae9e7910 deleted file mode 100644 index e69de29b..00000000 diff --git a/urbanLifelineWeb/packages/workcase_wechat/unpackage/cache/.mp-weixin/.uts2js/cache/uts_9b1b54d07a7a4d66ee84f54872fe1ae86df34bb1/types/cache/f75a75ae58b22e60f699e0abcc751262de3b7216 b/urbanLifelineWeb/packages/workcase_wechat/unpackage/cache/.mp-weixin/.uts2js/cache/uts_9b1b54d07a7a4d66ee84f54872fe1ae86df34bb1/types/cache/f75a75ae58b22e60f699e0abcc751262de3b7216 deleted file mode 100644 index e69de29b..00000000