diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 0ea61c65..00000000 --- a/pom.xml +++ /dev/null @@ -1,412 +0,0 @@ - - - 4.0.0 - - com.yanzhu - yanzhu - 3.6.2 - - yanzhu - http://www.sxyanzhu.com - 研筑微服务系统 - - - 3.6.2 - UTF-8 - UTF-8 - 1.8 - 2.7.7 - 2021.0.5 - 2021.0.4.0 - 2.7.10 - 3.0.0 - 1.6.2 - 1.27.2 - 2.3.3 - 1.4.6 - 1.2.16 - 3.5.2 - 2.16.1 - 1.18.16 - 2.3 - 2.0.23 - 0.9.1 - 8.2.2 - 5.3.0 - 2.5.1 - 4.0.6.B - 4.0.6.B - 2.14.2 - 5.8.20 - 1.9.1 - 2.1.7 - 1.12.0 - 1.0 - 5.5.13 - 15.8.0 - - - - - - - - - org.springframework.cloud - spring-cloud-dependencies - ${spring-cloud.version} - pom - import - - - - - com.alibaba.cloud - spring-cloud-alibaba-dependencies - ${spring-cloud-alibaba.version} - pom - import - - - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - pom - import - - - - - com.github.tobato - fastdfs-client - ${tobato.version} - - - - - io.swagger - swagger-models - ${swagger.core.version} - - - io.swagger - swagger-annotations - ${swagger.core.version} - - - - - pro.fessional - kaptcha - ${kaptcha.version} - - - - - com.github.pagehelper - pagehelper-spring-boot-starter - ${pagehelper.boot.version} - - - - - commons-io - commons-io - ${commons.io.version} - - - - - org.apache.poi - poi-ooxml - ${poi.version} - - - - - com.lowagie - itext - ${lowagie.version} - - - - com.lowagie - itext-rtf - ${lowagie.version} - - - - com.lowagie - iTextAsian - ${lowagie.iTextAsian.version} - - - - - org.apache.poi - poi - ${poi.version} - - - - org.apache.poi - poi-ooxml-schemas - 4.1.2 - - - - com.deepoove - poi-tl - ${poi-tl.version} - - - - - org.aspectj - aspectjweaver - ${aspectjweaver.version} - - - - com.aspose - aspose-words - ${aspose.words.version} - - - - - org.apache.velocity - velocity-engine-core - ${velocity.version} - - - - - com.alibaba.fastjson2 - fastjson2 - ${fastjson.version} - - - - - io.jsonwebtoken - jjwt - ${jjwt.version} - - - - - com.alibaba - transmittable-thread-local - ${transmittable-thread-local.version} - - - - - com.belerweb - pinyin4j - ${pinyin4j.version} - - - - - com.github.binarywang - weixin-java-mp - ${weixin.mp.version} - - - - - com.github.binarywang - weixin-java-miniapp - ${weixin.miniapp.version} - - - - - com.yanzhu - yanzhu-common-core - ${yanzhu.version} - - - - - com.yanzhu - yanzhu-common-swagger - ${yanzhu.version} - - - - - com.yanzhu - yanzhu-common-security - ${yanzhu.version} - - - - - com.yanzhu - yanzhu-common-datascope - ${yanzhu.version} - - - - - com.yanzhu - yanzhu-common-datasource - ${yanzhu.version} - - - - - com.yanzhu - yanzhu-common-log - ${yanzhu.version} - - - - - com.yanzhu - yanzhu-common-redis - ${yanzhu.version} - - - - - com.yanzhu - yanzhu-api-system - ${yanzhu.version} - - - - net.sf.mpxj - mpxj - 13.0.2 - - - - - - - yanzhu-api - yanzhu-common - yanzhu-auth - yanzhu-gateway - yanzhu-modules - yanzhu-monitor - yanzhu-rocketmq - - pom - - - - - org.springframework.cloud - spring-cloud-starter-bootstrap - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - ${spring-boot.version} - - - - repackage - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${java.version} - ${java.version} - ${project.build.sourceEncoding} - - - - - - - - - public - aliyun nexus - https://maven.aliyun.com/repository/public - - true - - - - - - - public - aliyun nexus - https://maven.aliyun.com/repository/public - - true - - - false - - - - - - - - 本地服务器环境 - - - 本地服务器环境 - 62.234.3.186:8848 - - - - - 测试服务器环境 - - 测试服务器环境 - 62.234.3.186:8848 - - - - true - - - - 线上服务器环境 - - 线上服务器环境 - 0.0.0.0:8848 - - - - - docker测试环境1 - - docker测试环境1 - http://0.0.0.0:5001 - - - - docker测试环境2 - - docker测试环境2 - http://0.0.0.0:5001 - - - - - \ No newline at end of file diff --git a/yanzhu-api/pom.xml b/yanzhu-api/pom.xml deleted file mode 100644 index 47ec57cf..00000000 --- a/yanzhu-api/pom.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - com.yanzhu - yanzhu - 3.6.2 - - 4.0.0 - - - yanzhu-api-system - - - yanzhu-api - pom - - - yanzhu-api系统接口 - - - diff --git a/yanzhu-api/yanzhu-api-system/pom.xml b/yanzhu-api/yanzhu-api-system/pom.xml deleted file mode 100644 index be9fb913..00000000 --- a/yanzhu-api/yanzhu-api-system/pom.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - com.yanzhu - yanzhu-api - 3.6.2 - - 4.0.0 - - yanzhu-api-system - - - yanzhu-api-system系统接口模块 - - - - - - - com.yanzhu - yanzhu-common-core - - - - - \ No newline at end of file diff --git a/yanzhu-auth/pom.xml b/yanzhu-auth/pom.xml deleted file mode 100644 index be53cfe8..00000000 --- a/yanzhu-auth/pom.xml +++ /dev/null @@ -1,154 +0,0 @@ - - - com.yanzhu - yanzhu - 3.6.2 - - 4.0.0 - - yanzhu-auth - - - yanzhu-auth认证授权中心 - - - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-sentinel - - - - - org.springframework.boot - spring-boot-starter-web - - - - - org.springframework.boot - spring-boot-starter-actuator - - - - - com.yanzhu - yanzhu-common-security - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - 2.5.15 - - true - - - - - repackage - - - - - - org.apache.maven.plugins - maven-war-plugin - 3.1.0 - - false - ${project.artifactId} - - - - ${project.artifactId} - - - - src/main/resources - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/yanzhu-auth/src/main/resources/bootstrap.yml b/yanzhu-auth/src/main/resources/bootstrap.yml deleted file mode 100644 index d54c82d2..00000000 --- a/yanzhu-auth/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,27 +0,0 @@ -# Tomcat -server: - port: 9200 - -# Spring -spring: - application: - # 应用名称 - name: yanzhu-auth - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: @discovery.server-addr@ - # 服务分组 - group: lijun - config: - # 配置中心地址 - server-addr: @discovery.server-addr@ - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/yanzhu-bigscreen/src/api/detail.js b/yanzhu-bigscreen/src/api/detail.js index 9d1ef10a..9c5a2c4b 100644 --- a/yanzhu-bigscreen/src/api/detail.js +++ b/yanzhu-bigscreen/src/api/detail.js @@ -133,16 +133,16 @@ const costOutputSelectYearAndMonth=(data)=> { return it; }); let y=data.year; - let m=data.month-1; - if(m==0){ - m=12; - y--; - } + let m=data.month; + //if(m==0){ + // m=12; + // y--; + //} let tmps2=(res[1].data||[]).map(it=>{ it.money=it.money?it.money/10000.0:0; return it; }); - let curM=tmps2.filter(it=>it.costType==9 && it.year==y && it.month==m); + let curM=tmps.filter(it=>it.costType==9 && it.year==y && it.month==m); curM=curM.length>0?curM[0]:{}; let totalObjs=tmps.filter(it=>it.costType==9); diff --git a/yanzhu-bigscreen/src/components/header.vue b/yanzhu-bigscreen/src/components/header.vue index 0159b1ca..bb6c20db 100644 --- a/yanzhu-bigscreen/src/components/header.vue +++ b/yanzhu-bigscreen/src/components/header.vue @@ -5,21 +5,101 @@
项目概况
项目详情
-
安全管理
-
质量管理
-
进度管理
-
视频监控
+
+
安全管理
+
+
+
+
+ + + + +
+
+ + + + +
+
+ + + +
+
+
+
+
+
质量管理
+
+
+
+
+ + + + +
+
+ + + + +
+
+
+
+
+
进度管理
+
+
+
+
+ + +
+
+
+
+
+ 数字建安施工管理平台
-
绿碳中心
+
绿碳中心
-
- - - - - - - - + + + + + + + + @@ -55,7 +136,8 @@ export default { data() { return { nav: 1, - selProject: '', + selProject: null, + selProjectId: '', projects: [], isFullScreen: false, } @@ -79,7 +161,7 @@ export default { this.projects = d.rows || []; if (this.projects.length > 0) { let id = localStorage.getItem("selProj") || this.projects[0].id - this.selProject = +id; + this.selProjectId = +id; this.doProjectSelect(); } }); @@ -93,21 +175,44 @@ export default { }, 400); }, doProjectSelect() { - let tmps = this.projects.filter(d => d.id == this.selProject); + let tmps = this.projects.filter(d => d.id == this.selProjectId); if (tmps.length > 0) { this.$store.dispatch('SetSelProject', tmps[0]); + this.selProject = tmps[0]; } else { this.$store.dispatch('SetSelProject', null); + this.selProject = null; } - localStorage.setItem("selProj", this.selProject); + localStorage.setItem("selProj", this.selProjectId); }, doNav(n) { if (this.nav == n) { return; } this.nav = n; - let path = ["/index", "/detail", "/prjSafety", "/prjQuality", "/prjProgress","/greenCarbon","/videoMonitor"][n - 1]; - this.$router.push(path); + switch (n) { + case 1: + this.$router.push("/index"); + break; + case 2: + this.$router.push("/detail"); + break; + case 3: + this.$router.push("/prjSafety"); + break; + case 309: + this.$router.push("/videoMonitor"); + break; + case 4: + this.$router.push("/prjQuality"); + break; + case 5: + this.$router.push("/prjProgress"); + break; + case 6: + this.$router.push("/greenCarbon"); + break; + } }, doLogout() { this.$confirm('确定注销并退出系统吗？', '提示', { @@ -133,6 +238,65 @@ export default { color: #3da2ff; font-size: 32px; font-weight: bold; + + .prj-logo { + width: 40px; + height: 40px; + vertical-align: middle; + border-radius: 20px; + } + } + + .head-title-tab { + .has-submenu { + &:hover { + .header-btn-list { + display: block; + } + } + + .header-btn-list { + display: none; + + .header-btn-list-item { + .header-btn-list-padding { + padding: 0px; + + button { + width: 120px; + } + + &.menu-row2 { + .sub-btn { + color: #fff; + + &:hover { + color: #ccc; + } + } + } + + &.menu-row1 { + .sub-btn { + color: rgb(1, 169, 255); + + &:hover { + color: #fff; + } + } + } + + .sub-btn { + &.active { + color: #ffffffaa; + } + } + } + + } + } + + } } } @@ -145,6 +309,12 @@ export default { padding: 5px 40px; position: relative; top: -8px; + .prj-logo { + width: 40px; + height: 40px; + vertical-align: middle; + border-radius: 20px; + } } } @@ -163,20 +333,41 @@ export default { top: -5px; } } + .header-sel-project-pop { transform: scale(1.5); width: 200px; min-width: unset !important; margin-left: 50px; } + + .head-title-tab { + .header-btn-list { + top: 40px; + left: 40px; + + .sub-btn { + font-size: 18px; + width: 140px !important; + line-height: 40px; + height: 40px; + } + } + } } @media (min-width: 2561px) { - + .header-center { font-size: 52px !important; margin-top: 10px; + .prj-logo { + width: 50px; + height: 50px; + vertical-align: middle; + border-radius: 25px; + } } .header-title-user-info { @@ -196,5 +387,19 @@ export default { min-width: unset !important; margin-left: 100px; } + + .head-title-tab { + .header-btn-list { + top: 50px; + left: 50px; + + .sub-btn { + font-size: 24px; + width: 160px !important; + line-height: 50px; + height: 50px; + } + } + } } \ No newline at end of file diff --git a/yanzhu-bigscreen/src/pages-old/projectDetail.vue b/yanzhu-bigscreen/src/pages-old/projectDetail.vue index 94907f35..93044633 100644 --- a/yanzhu-bigscreen/src/pages-old/projectDetail.vue +++ b/yanzhu-bigscreen/src/pages-old/projectDetail.vue @@ -95,7 +95,7 @@ 今日出勤 - @@ -123,7 +123,7 @@
@@ -304,9 +304,10 @@ 计划开工日期

- {{ - fmtDate(getCurProject().scheduledStartTime || "") - }} + + {{getCurProject()}}{{ + fmtDate(getCurProject().scheduledStartTime || "") + }}
@@ -355,8 +356,8 @@

{{ - fmtDate(getCurProject().plannedCompletionTime || "") - }} + fmtDate(getCurProject().plannedCompletionTime || "") + }}
@@ -513,9 +514,9 @@ 实际：{{ item.endDate || "--" }}
+ ' state-' + + item.finishState + "> {{ item.finish }}
@@ -914,13 +915,13 @@ export default { this.projectLvlDict = d || []; }); }, - mounted() { + mounted() { this.$bus.$on( "projectChange", debounce((res) => { - this.project = res||this.$root.project; - this.dept=this.$root.dept||this.dept; - this.prjs= this.$root.projects||this.prjs; + this.project = res || this.$root.project; + this.dept = this.$root.dept || this.dept; + this.prjs = this.$root.projects || this.prjs; this.mapName = ""; if (res.id == 0) { if (this.prjs.length > 1) { @@ -932,7 +933,7 @@ export default { this.loadData(); this.loadFilshNode(); }) - ); + ); if (this.$root.hasInitHeader) { this.initMe(); } @@ -942,14 +943,14 @@ export default { * 劳资预警详情弹窗 */ doFlowLabourDlg() { - if(this.project.id==0){ - if(this.prjs.length>1){ + if (this.project.id == 0) { + if (this.prjs.length > 1) { this.$refs.flowLabourDlg.showDialog(this.prjs[1]); } - }else{ + } else { this.$refs.flowLabourDlg.showDialog(this.project); } - + }, getFloorArea() { this.getProjectId((id) => { @@ -982,7 +983,7 @@ export default { } else { this.$refs.jobWorkerdlg.showDialog({ ...data, - type:this.infoNav, + type: this.infoNav, total: this.laborPersonnelTotal, datas: this.laborPersonnelData.map((it) => { return { @@ -1068,11 +1069,11 @@ export default { } if (this.project.id == 0) { if (this.prjs.length > 1) { - return this.prjs[1]; + return this.prjs[1]||{}; } return {}; } - return this.project; + return this.project||{}; }, getProjectId(cb) { let func = () => { @@ -1680,9 +1681,11 @@ export default { width: calc(100% - 4px); height: calc(100% - 26px); padding-left: 1px; - .el-carousel{ + + .el-carousel { height: 100%; } + .photography-video { width: 100%; height: calc(100% - 30px); diff --git a/yanzhu-bigscreen/src/views/projectDetail.vue b/yanzhu-bigscreen/src/views/projectDetail.vue index 11b4a595..bc5cb0d7 100644 --- a/yanzhu-bigscreen/src/views/projectDetail.vue +++ b/yanzhu-bigscreen/src/views/projectDetail.vue @@ -214,7 +214,7 @@
-
+
diff --git a/yanzhu-bigscreen/src/views/videoMonitor.vue b/yanzhu-bigscreen/src/views/videoMonitor.vue index 8a5ef6b9..e842bbab 100644 --- a/yanzhu-bigscreen/src/views/videoMonitor.vue +++ b/yanzhu-bigscreen/src/views/videoMonitor.vue @@ -76,7 +76,7 @@ export default { } }, mounted() { - this.$store.dispatch('ChangeNav', 7); + this.$store.dispatch('ChangeNav', 309); this.dpi = this.$dpi(); window.addEventListener("resize", () => { if (this.dpi != this.$dpi()) { diff --git a/yanzhu-common/pom.xml b/yanzhu-common/pom.xml deleted file mode 100644 index 882033ed..00000000 --- a/yanzhu-common/pom.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - com.yanzhu - yanzhu - 3.6.2 - - 4.0.0 - - - yanzhu-common-log - yanzhu-common-core - yanzhu-common-redis - yanzhu-common-swagger - yanzhu-common-security - yanzhu-common-datascope - yanzhu-common-datasource - yanzhu-common-mapper - - - yanzhu-common - pom - - - yanzhu-common通用模块 - - - diff --git a/yanzhu-common/yanzhu-common-core/pom.xml b/yanzhu-common/yanzhu-common-core/pom.xml deleted file mode 100644 index 474002f4..00000000 --- a/yanzhu-common/yanzhu-common-core/pom.xml +++ /dev/null @@ -1,147 +0,0 @@ - - - - com.yanzhu - yanzhu-common - 3.6.2 - - 4.0.0 - - yanzhu-common-core - - - yanzhu-common-core核心模块 - - - - - - - org.springframework.cloud - spring-cloud-starter-openfeign - - - - - org.springframework.cloud - spring-cloud-starter-loadbalancer - - - - - org.springframework - spring-context-support - - - - - org.springframework - spring-web - - - - - com.alibaba - transmittable-thread-local - - - - - com.github.pagehelper - pagehelper-spring-boot-starter - - - - - org.springframework.boot - spring-boot-starter-validation - - - - - com.fasterxml.jackson.core - jackson-databind - - - - - com.alibaba.fastjson2 - fastjson2 - - - - - io.jsonwebtoken - jjwt - - - - - javax.xml.bind - jaxb-api - - - - - org.apache.commons - commons-lang3 - - - - - commons-io - commons-io - - - - - org.apache.poi - poi-ooxml - - - - - javax.servlet - javax.servlet-api - - - - - io.swagger - swagger-annotations - - - - org.projectlombok - lombok - - - - - com.belerweb - pinyin4j - - - - - com.github.binarywang - weixin-java-mp - - - - - com.github.binarywang - weixin-java-miniapp - - - - - cn.hutool - hutool-core - ${hutool.version} - - - - diff --git a/yanzhu-common/yanzhu-common-datascope/pom.xml b/yanzhu-common/yanzhu-common-datascope/pom.xml deleted file mode 100644 index a836d788..00000000 --- a/yanzhu-common/yanzhu-common-datascope/pom.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - com.yanzhu - yanzhu-common - 3.6.2 - - 4.0.0 - - yanzhu-common-datascope - - - yanzhu-common-datascope权限范围 - - - - - - - com.yanzhu - yanzhu-common-security - - - - \ No newline at end of file diff --git a/yanzhu-common/yanzhu-common-datasource/pom.xml b/yanzhu-common/yanzhu-common-datasource/pom.xml deleted file mode 100644 index d8933f3d..00000000 --- a/yanzhu-common/yanzhu-common-datasource/pom.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - com.yanzhu - yanzhu-common - 3.6.2 - - 4.0.0 - - yanzhu-common-datasource - - - yanzhu-common-datasource多数据源 - - - - - - - com.alibaba - druid-spring-boot-starter - ${druid.version} - - - - - com.baomidou - dynamic-datasource-spring-boot-starter - ${dynamic-ds.version} - - - - \ No newline at end of file diff --git a/yanzhu-common/yanzhu-common-log/pom.xml b/yanzhu-common/yanzhu-common-log/pom.xml deleted file mode 100644 index ee55dd7c..00000000 --- a/yanzhu-common/yanzhu-common-log/pom.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - com.yanzhu - yanzhu-common - 3.6.2 - - 4.0.0 - - yanzhu-common-log - - - yanzhu-common-log日志记录 - - - - - - - com.yanzhu - yanzhu-common-security - - - - \ No newline at end of file diff --git a/yanzhu-common/yanzhu-common-mapper/pom.xml b/yanzhu-common/yanzhu-common-mapper/pom.xml deleted file mode 100644 index 9ec699b0..00000000 --- a/yanzhu-common/yanzhu-common-mapper/pom.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - com.yanzhu - yanzhu-common - 3.6.2 - - 4.0.0 - - yanzhu-common-mapper - - - yanzhu-common-mapper - - - - - - - com.yanzhu - yanzhu-common-security - - - org.projectlombok - lombok - provided - - - - - \ No newline at end of file diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProProjectInfoMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProProjectInfoMapper.java index 73bbc81c..cf586b6e 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProProjectInfoMapper.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProProjectInfoMapper.java @@ -74,4 +74,6 @@ public interface ProProjectInfoMapper * @return */ public int updateDept(ProDept proDept); + + List selectMyProjectList(ProProjectInfo proProjectInfo); } diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProMilestoneMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProMilestoneMapper.xml index 92b918eb..906f084f 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProMilestoneMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProMilestoneMapper.xml @@ -103,11 +103,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" comid = #{comid}, project_id = #{projectId}, node_name = #{nodeName}, - scheduled_start = #{scheduledStart}, - scheduled_end = #{scheduledEnd}, - actual_start = #{actualStart}, - actual_end = #{actualEnd}, - days = #{days}, + scheduled_start = #{scheduledStart}, + scheduled_end = #{scheduledEnd}, + actual_start = #{actualStart}, + actual_end = #{actualEnd}, + days = #{days}, explain_info = #{explainInfo}, is_del = #{isDel}, remark = #{remark}, diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoMapper.xml index 7a0b2937..73b634e8 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoMapper.xml @@ -345,5 +345,41 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where dept_id = #{deptId} - + \ No newline at end of file diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml index 8fbb3559..6fa25b11 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml @@ -273,7 +273,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) u ON u.craft_type = dic.dict_value WHERE - dic.dict_type = 'pro_craft_type'; + dic.dict_type = 'pro_craft_type'