功能修复

jp-console/jeeplus-module/ly/src/main/java/com/jeeplus/enterpriseinfo/service/EnterpriseInfoService.java

@@ -465,7 +465,8 @@ public class EnterpriseInfoService extends ServiceImpl<EnterpriseInfoMapper, Ent
         boolean noNeedUpdate = existing.getLxr().equals(dto.getLxr())
                 && existing.getPhone().equals(dto.getPhone())
                 && existing.getDes13().equals(dto.getDes13())
-                && existing.getDes14().equals(dto.getDes14());
+                && existing.getDes14().equals(dto.getDes14())
+                && existing.getDes1().equals(dto.getDes1());
 
         if (noNeedUpdate) {
             return "NOUPDATE";
@@ -478,6 +479,7 @@ public class EnterpriseInfoService extends ServiceImpl<EnterpriseInfoMapper, Ent
         existing.setPhone(dto.getPhone());
         existing.setDes13(dto.getDes13());
         existing.setDes14(dto.getDes14());
+        existing.setDes1(dto.getDes1());
         this.updateById(existing);
 
         // 同步更新账号

jp-mobile/pages/index/Dzfindex.vue

@@ -36,7 +36,7 @@
 			
 
 		<view class="line-box" style="margin-top: 80rpx;">
-			<view class="center-box" v-if="roleIds=='1910175386924417025'||roleIds=='1910175949166673921'" >
+			<view class="center-box" v-if="hasRole('1910175386924417025')||hasRole('1910175949166673921')" >
 				<view class="center-left-box">
 					<view class="btn-box-1 mart-t">
 						{{pageInfo2.des1||0}}
@@ -73,34 +73,34 @@
 								
 				<view class="center-left-box">
 					<!-- 企业 -->
-					<view class="btn-Imbox" @click="totongxunlu3" v-if="roleIds=='38a14f1f42ed424eab4cb5d489596b0d'">
+					<view class="btn-Imbox" @click="totongxunlu3" v-if="hasRole('38a14f1f42ed424eab4cb5d489596b0d')">
 						<image  class="center-img" src="/static/img/cd1.png"></image>
 						<p>问题诉求{{p1}}</p>
 					</view>
 					<!-- 企业 -->
-					<view class="btn-Imbox" @click="totongxunlu4" v-if="roleIds=='38a14f1f42ed424eab4cb5d489596b0d'">
+					<view class="btn-Imbox" @click="totongxunlu4" v-if="hasRole('38a14f1f42ed424eab4cb5d489596b0d')">
 						<image  class="center-img" src="/static/img/cd2.png"></image>
 						<p>满意度评价{{p2}}</p>
 					</view> 
 					<!-- 企业 -->
-					<view class="btn-Imbox" @click="totongxunlu3" v-if="roleIds=='38a14f1f42ed424eab4cb5d489596b0d'">
+					<view class="btn-Imbox" @click="totongxunlu3" v-if="hasRole('38a14f1f42ed424eab4cb5d489596b0d')">
 						<image  class="center-img" src="/static/img/cd3.png"></image>
 						<p>诉求记录</p>
 					</view>
 										
 					<!-- 挂钩干部 -->
-					<view class="btn-Imbox" @click="totongxunlu25" v-if="roleIds=='1915280292672946177'">
+					<view class="btn-Imbox" @click="totongxunlu25" v-if="hasRole('1915280292672946177')">
 						<image  class="center-img" src="/static/img/cd5.png"></image>
 						<p>服务对接</p>
 					</view>
 					<!-- 挂钩干部或大走访办公室或交办部门 -->
-					<view class="btn-Imbox" @click="totongxunlu3" v-if="roleIds=='1915280292672946177'||roleIds=='1910175386924417025'||roleIds=='1910175949166673921'">
+					<view class="btn-Imbox" @click="totongxunlu3" v-if="hasRole('1915280292672946177')||hasRole('1910175386924417025')||hasRole('1910175949166673921')">
 						<image  class="center-img" src="/static/img/cd4.png"></image>
 						<p>问题处理{{p1}}</p>
 					</view>
 					
 					<!-- 大走访办公室或交办部门 -->
-					<view class="btn-Imbox" @click="totongxunlu5" v-if="roleIds=='1910175386924417025'||roleIds=='1910175949166673921'">
+					<view class="btn-Imbox" @click="totongxunlu5" v-if="hasRole('1910175386924417025')||hasRole('1910175949166673921')">
 						<image  class="center-img" src="/static/img/cd6.png"></image>
 						<p>进度统计</p>
 					</view>		
@@ -213,7 +213,7 @@
 				uni.hideLoading();
 			})
 			
-			if(this.roleIds.indexOf("1910175386924417025") != -1||this.roleIds.indexOf("1910175949166673921") != -1){
+			if(this.roleIds.includes("1910175386924417025") ||this.roleIds.includes("1910175949166673921") ){
 				loginService.getDzfCount().then(({
 					data
 				}) => {
@@ -440,11 +440,11 @@
 				let userInfo = uni.getStorageSync('WMS-userinfo')
 				var officeId = userInfo.officeDTO.id;
 				var roleIds = userInfo.roleIds;
-				if (roleIds.indexOf("17bac1f980264e3e8193bc965538e2c6") != -1) {
+				if (roleIds.includes("17bac1f980264e3e8193bc965538e2c6") ) {
 					//// 管理员
 					this.stype = 5
 					uni.setStorageSync('stype', this.stype);
-				} else if (roleIds.indexOf("ade960e8f02544998b07397304c059c1") != -1) {
+				} else if (roleIds.includes("ade960e8f02544998b07397304c059c1")) {
 					// 政府管理员
 					this.stype = 4
 					uni.setStorageSync('stype', this.stype);
@@ -465,6 +465,12 @@
 				
 			},
 			
+			// 判断是否有指定角色
+			hasRole(roleId) {
+				
+				return this.roleIds.split(',').includes(roleId);
+			},
+			
 			toOut() {
 				//window.location.href = "https://ydwqfw.com.cn/yd_qycpfbH5/#/"
 				window.location.href = "https://dlt.yczgsz.com/mini/pageEnterpriseVisit/workbench/workbench"

jp-mobile/pages/index/index.vue

@@ -544,7 +544,9 @@
 					
 				}else{
 					let roleIds= $auth.getUserInfo().roleIds;
-					if(roleIds=='1910175386924417025'||roleIds=='17bac1f980264e3e8193bc965538e2c6'||roleIds=='ade960e8f02544998b07397304c059c1'){
+					
+										
+					if(roleIds.includes('1910175386924417025')||roleIds.includes('17bac1f980264e3e8193bc965538e2c6')||roleIds.includes('ade960e8f02544998b07397304c059c1')){
 						uni.navigateTo({
 							url: '/pages/buildList/buildList3?w=1'
 						})
@@ -556,7 +558,7 @@
 					
 				}else{
 					let roleIds= $auth.getUserInfo().roleIds;
-					if(roleIds=='1910175386924417025'||roleIds=='17bac1f980264e3e8193bc965538e2c6'||roleIds=='ade960e8f02544998b07397304c059c1'){
+					if(roleIds.includes('1910175386924417025')||roleIds.includes('17bac1f980264e3e8193bc965538e2c6')||roleIds.includes('ade960e8f02544998b07397304c059c1')){
 						uni.navigateTo({
 							url: '/pages/buildList/buildList3?w=2'
 						})

jp-mobile/pages/question/questionInfo.vue

@@ -135,7 +135,7 @@
 				
 				
 				<!-- 挂钩干部 -->
-				<view class="cu-form-group margin-top" v-if="roleIds=='1915280292672946177'" >
+				<view class="cu-form-group margin-top" v-if="roleIds.includes('1915280292672946177')" >
 					<view class="title">
 						问题处理
 					</view>
@@ -149,7 +149,7 @@
 					</radio-group>
 				</view>
 				<!-- 大走访办公室 -->
-				<view class="cu-form-group margin-top" v-if="roleIds=='1910175386924417025'" >
+				<view class="cu-form-group margin-top" v-if="roleIds.includes('1910175386924417025')" >
 					<view class="title">
 						问题处理
 					</view>
@@ -164,7 +164,7 @@
 				</view>
 				
 				<!-- 交办部门 -->
-				<view class="cu-form-group margin-top" v-if="roleIds=='1910175949166673921'" >
+				<view class="cu-form-group margin-top" v-if="roleIds.includes('1910175949166673921')" >
 					<view class="title">
 						问题处理
 					</view>
@@ -179,7 +179,7 @@
 				</view>
 				
 				<!-- 挂钩干部或大走访办公室或交办部门 -->			
-				<view class="cu-form-group margin-top" v-if="roleIds=='1910175386924417025'||roleIds=='1915280292672946177'||roleIds=='1910175949166673921'" >
+				<view class="cu-form-group margin-top" v-if="roleIds.includes('1910175386924417025')||roleIds.includes('1915280292672946177')||roleIds.includes('1910175949166673921')" >
 					<view class="title">
 						预计办结时间
 					</view>					
@@ -217,14 +217,14 @@
 				</view>	
 				
 				
-				<view class="cu-form-group margin-top" v-if="(roleIds=='1910175386924417025'||roleIds=='1915280292672946177')&&item.showjbdw">
+				<view class="cu-form-group margin-top" v-if="(roleIds.includes('1910175386924417025')||roleIds.includes('1915280292672946177'))&&item.showjbdw">
 					<view class="title">
 						交办要求
 					</view>
 					<textarea maxlength="-1" v-model="item.delyj" placeholder="请填写交办要求"  ></textarea>
 				</view>
 				
-				<view class="cu-form-group margin-top" v-if="(roleIds=='1910175386924417025'||roleIds=='1915280292672946177'||roleIds=='1910175949166673921')&&!item.showjbdw">
+				<view class="cu-form-group margin-top" v-if="(roleIds.includes('1910175386924417025')||roleIds.includes('1915280292672946177')||roleIds.includes('1910175949166673921'))&&!item.showjbdw">
 					<view class="title">
 						处理建议
 					</view>
@@ -247,7 +247,7 @@
 				</view> -->
 				
 				
-				<view class="cu-form-group margin-top" style="border-bottom: 3px solid #eee;" v-if="roleIds=='1910175386924417025'||roleIds=='1915280292672946177'||roleIds=='1910175949166673921'">
+				<view class="cu-form-group margin-top" style="border-bottom: 3px solid #eee;" v-if="roleIds.includes('1910175386924417025')||roleIds.includes('1915280292672946177')||roleIds.includes('1910175949166673921')">
 					<uni-file-picker style="margin-bottom: 10px;" limit="9" ref="picFile" v-model="item.picLists"
 						fileMediatype="all" mode="grid" title="附件上传" :auto-upload="autoUpload" @select="(e) => select(e, index2)"
 						@progress="progress" @success="success" @fail="fail" @change="onChange" @delete="(e) => deleteFile(e, index2)"
@@ -333,14 +333,14 @@
 						
 			<view style="height: 40rpx;"></view>
 			
-			<view class="flexC" v-if="roleIds=='1910175386924417025'&&!cansubmit">
-				<button v-if="roleIds=='1910175386924417025'" @click="del" class="bt1  block  margin-tb-sm lg bg-red">删除</button>
+			<view class="flexC" v-if="roleIds.includes('1910175386924417025')&&!cansubmit">
+				<button v-if="roleIds.includes('1910175386924417025')" @click="del" class="bt1  block  margin-tb-sm lg bg-red">删除</button>
 	
 			</view>
 			
 			<view class="flexC" v-if="cansubmit">
-				<button v-if="roleIds=='38a14f1f42ed424eab4cb5d489596b0d'" @click="save" class="bt1  block  margin-tb-sm lg">暂存</button>
-				<button v-if="roleIds=='1910175386924417025'" @click="del" class="bt1  block  margin-tb-sm lg bg-red">删除</button>
+				<button v-if="roleIds.includes('38a14f1f42ed424eab4cb5d489596b0d')" @click="save" class="bt1  block  margin-tb-sm lg">暂存</button>
+				<button v-if="roleIds.includes('1910175386924417025')" @click="del" class="bt1  block  margin-tb-sm lg bg-red">删除</button>
 				<button form-type="submit" class="bt1 cu-btn block bg-blue margin-tb-sm lg">提交</button>
 			</view>
 			
@@ -494,7 +494,7 @@
 							
 							if(data2.data.dzfQuestionDetilDTOList[i].oplist[j].opType=='3'){								
 								//挂钩干部
-								if(this.roleIds=='1915280292672946177'){
+								if(this.roleIds.includes('1915280292672946177')){
 									data2.data.dzfQuestionDetilDTOList[i].current=2
 								//交办部门
 								}else{
@@ -507,7 +507,7 @@
 								data2.data.dzfQuestionDetilDTOList[i].current=1
 							}else if(data2.data.dzfQuestionDetilDTOList[i].oplist[j].opType=='5'){
 								//挂钩干部
-								if(this.roleIds=='1915280292672946177'){
+								if(this.roleIds.includes('1915280292672946177')){
 									data2.data.dzfQuestionDetilDTOList[i].current=0
 								//交办部门
 								}else{
@@ -515,7 +515,7 @@
 								}
 							}else if(data2.data.dzfQuestionDetilDTOList[i].oplist[j].opType=='6'){								
 								//挂钩干部
-								if(this.roleIds=='1915280292672946177'){
+								if(this.roleIds.includes('1915280292672946177')){
 									data2.data.dzfQuestionDetilDTOList[i].current=3
 								//交办部门
 								}else{
@@ -523,7 +523,7 @@
 								}
 							}else if(data2.data.dzfQuestionDetilDTOList[i].oplist[j].opType=='7'){
 								//挂钩干部
-								if(this.roleIds=='1915280292672946177'){
+								if(this.roleIds.includes('1915280292672946177')){
 									data2.data.dzfQuestionDetilDTOList[i].current=4
 								//交办部门
 								}else{
@@ -531,7 +531,7 @@
 								}
 							}else if(data2.data.dzfQuestionDetilDTOList[i].oplist[j].opType=='8'){
 								//挂钩干部
-								if(this.roleIds=='1915280292672946177'){
+								if(this.roleIds.includes('1915280292672946177')){
 									data2.data.dzfQuestionDetilDTOList[i].current=5
 								//交办部门
 								}else{
@@ -576,7 +576,7 @@
 					
 					//2025-7-3 添加是大走访时都能添加修改交办单位
 					//当前问题没有办结，即可修改
-					if(data2.data.dzfQuestionDetilDTOList[i].states!='0'&&data2.data.dzfQuestionDetilDTOList[i].states!=undefined&&this.roleIds=='1910175386924417025'){
+					if(data2.data.dzfQuestionDetilDTOList[i].states!='0'&&data2.data.dzfQuestionDetilDTOList[i].states!=undefined&&this.roleIds.includes('1910175386924417025')){
 						console.log("问题："+data2.data.dzfQuestionDetilDTOList[i].states)
 						data2.data.dzfQuestionDetilDTOList[i].showjbdw2=false;
 						data2.data.dzfQuestionDetilDTOList[i].showjbdw=true;
@@ -651,7 +651,7 @@
 			},
 			radioChange: function(evt,index2) {	
 				//大走访办公室角色时
-				if(this.roleIds=='1910175386924417025'){
+				if(this.roleIds.includes('1910175386924417025')){
 					if(evt.detail.value=='办结'){
 						this.questionList[index2].showjbdw=false;
 						this.questionList[index2].delyj="";
@@ -671,7 +671,7 @@
 						}
 					}
 				//挂钩干部	
-				}else if(this.roleIds=='1915280292672946177'){
+				}else if(this.roleIds.includes('1915280292672946177')){
 					
 					console.log("选择："+evt.detail.value);
 					for (let i = 0; i < this.dels.length; i++) {
@@ -681,7 +681,7 @@
 						}
 					}
 				//交办部门	
-				}else if(this.roleIds=='1910175949166673921'){
+				}else if(this.roleIds.includes('1910175949166673921')){
 					
 					console.log("选择："+evt.detail.value);
 					for (let i = 0; i < this.dels3.length; i++) {

jp-mobile/pages/question/questionInfo2.vue

@@ -124,7 +124,7 @@
 				
 				
 				<!-- 挂钩干部 -->
-				<view class="cu-form-group margin-top" v-if="roleIds=='1915280292672946177'" >
+				<view class="cu-form-group margin-top" v-if="roleIds.includes('1915280292672946177')" >
 					<view class="title">
 						问题处理
 					</view>
@@ -138,7 +138,7 @@
 					</radio-group>
 				</view>
 				<!-- 大走访办公室 -->
-				<view class="cu-form-group margin-top" v-if="roleIds=='1910175386924417025'" >
+				<view class="cu-form-group margin-top" v-if="roleIds.includes('1910175386924417025')" >
 					<view class="title">
 						问题处理
 					</view>
@@ -153,7 +153,7 @@
 				</view>
 				
 				<!-- 交办部门 -->
-				<view class="cu-form-group margin-top" v-if="roleIds=='1910175949166673921'" >
+				<view class="cu-form-group margin-top" v-if="roleIds.includes('1910175949166673921')" >
 					<view class="title">
 						问题处理
 					</view>
@@ -168,7 +168,7 @@
 				</view>
 				
 				<!-- 挂钩干部或大走访办公室或交办部门 -->			
-				<view class="cu-form-group margin-top" v-if="roleIds=='1910175386924417025'||roleIds=='1915280292672946177'||roleIds=='1910175949166673921'" >
+				<view class="cu-form-group margin-top" v-if="roleIds.includes('1910175386924417025')||roleIds.includes('1915280292672946177')||roleIds.includes('1910175949166673921')" >
 					<view class="title">
 						预计办结时间
 					</view>					
@@ -206,14 +206,14 @@
 				</view>	
 				
 				
-				<view class="cu-form-group margin-top" v-if="(roleIds=='1910175386924417025'||roleIds=='1915280292672946177')&&item.showjbdw">
+				<view class="cu-form-group margin-top" v-if="(roleIds.includes('1910175386924417025')||roleIds.includes('1915280292672946177'))&&item.showjbdw">
 					<view class="title">
 						交办要求
 					</view>
 					<textarea maxlength="-1" v-model="item.delyj" placeholder="请填写交办要求"  ></textarea>
 				</view>
 				
-				<view class="cu-form-group margin-top" v-if="(roleIds=='1910175386924417025'||roleIds=='1915280292672946177'||roleIds=='1910175949166673921')&&!item.showjbdw">
+				<view class="cu-form-group margin-top" v-if="(roleIds.includes('1910175386924417025')||roleIds.includes('1915280292672946177')||roleIds.includes('1910175949166673921'))&&!item.showjbdw">
 					<view class="title">
 						处理建议
 					</view>
@@ -236,7 +236,7 @@
 				</view> -->
 				
 				
-				<view class="cu-form-group margin-top" style="border-bottom: 3px solid #eee;" v-if="roleIds=='1910175386924417025'||roleIds=='1915280292672946177'||roleIds=='1910175949166673921'">
+				<view class="cu-form-group margin-top" style="border-bottom: 3px solid #eee;" v-if="roleIds.includes('1910175386924417025')||roleIds.includes('1915280292672946177')||roleIds.includes('1910175949166673921')">
 					<uni-file-picker style="margin-bottom: 10px;" limit="9" ref="picFile" v-model="item.picLists"
 						fileMediatype="all" mode="grid" title="附件上传" :auto-upload="autoUpload" @select="(e) => select(e, index2)"
 						@progress="progress" @success="success" @fail="fail" @change="onChange" @delete="(e) => deleteFile(e, index2)"
@@ -321,7 +321,7 @@
 						
 			<view style="height: 40rpx;"></view>
 			<view class="flexC" v-if="cansubmit">
-				<button v-if="roleIds=='38a14f1f42ed424eab4cb5d489596b0d'" @click="save" class="bt1  block  margin-tb-sm lg">暂存</button>
+				<button v-if="roleIds.includes('38a14f1f42ed424eab4cb5d489596b0d')" @click="save" class="bt1  block  margin-tb-sm lg">暂存</button>
 				<button form-type="submit" class="bt1 cu-btn block bg-blue margin-tb-sm lg">提交</button>
 			</view>
 			
@@ -480,7 +480,7 @@
 								data2.data.dzfQuestionDetilDTOList[i].current=1
 							}else if(data2.data.dzfQuestionDetilDTOList[i].oplist[j].opType=='5'){
 								//挂钩干部
-								if(this.roleIds=='1915280292672946177'){
+								if(this.roleIds.includes('1915280292672946177')){
 									data2.data.dzfQuestionDetilDTOList[i].current=2
 								//交办部门
 								}else{
@@ -488,7 +488,7 @@
 								}
 							}else if(data2.data.dzfQuestionDetilDTOList[i].oplist[j].opType=='6'){								
 								//挂钩干部
-								if(this.roleIds=='1915280292672946177'){
+								if(this.roleIds.includes('1915280292672946177')){
 									data2.data.dzfQuestionDetilDTOList[i].current=3
 								//交办部门
 								}else{
@@ -496,7 +496,7 @@
 								}
 							}else if(data2.data.dzfQuestionDetilDTOList[i].oplist[j].opType=='7'){
 								//挂钩干部
-								if(this.roleIds=='1915280292672946177'){
+								if(this.roleIds.includes('1915280292672946177')){
 									data2.data.dzfQuestionDetilDTOList[i].current=4
 								//交办部门
 								}else{
@@ -504,7 +504,7 @@
 								}
 							}else if(data2.data.dzfQuestionDetilDTOList[i].oplist[j].opType=='8'){
 								//挂钩干部
-								if(this.roleIds=='1915280292672946177'){
+								if(this.roleIds.includes('1915280292672946177')){
 									data2.data.dzfQuestionDetilDTOList[i].current=5
 								//交办部门
 								}else{
@@ -609,7 +609,7 @@
 			},
 			radioChange: function(evt,index2) {	
 				//大走访办公室角色时
-				if(this.roleIds=='1910175386924417025'){
+				if(this.roleIds.includes('1910175386924417025')){
 					if(evt.detail.value=='办结'){
 						this.questionList[index2].showjbdw=false;
 						this.questionList[index2].delyj="";
@@ -629,7 +629,7 @@
 						}
 					}
 				//挂钩干部	
-				}else if(this.roleIds=='1915280292672946177'){
+				}else if(this.roleIds.includes('1915280292672946177')){
 					
 					console.log("选择："+evt.detail.value);
 					for (let i = 0; i < this.dels.length; i++) {
@@ -639,7 +639,7 @@
 						}
 					}
 				//交办部门	
-				}else if(this.roleIds=='1910175949166673921'){
+				}else if(this.roleIds.includes('1910175949166673921')){
 					
 					console.log("选择："+evt.detail.value);
 					for (let i = 0; i < this.dels3.length; i++) {

jp-mobile/pages/question/questionList.vue

@@ -181,12 +181,12 @@
 			}
 			
 			//只有企业角色才能发起问题诉求			
-			if($auth.getUserInfo().roleIds=="38a14f1f42ed424eab4cb5d489596b0d"){
+			if($auth.getUserInfo().roleIds.includes("38a14f1f42ed424eab4cb5d489596b0d")){
 				this.canAdd	=true;
 			}
 				
 			//除了交办部门其他都显示筛选	
-			if($auth.getUserInfo().roleIds=="1910175949166673921"){
+			if($auth.getUserInfo().roleIds.includes("1910175949166673921")){
 				this.showTab=false;
 			}