diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/WxMenuConfigMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/WxMenuConfigMapper.xml
index 0743c669..a13a31dd 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/WxMenuConfigMapper.xml
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/WxMenuConfigMapper.xml
@@ -137,7 +137,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join wx_menu_config_role smcr on smcr.smcid = smc.id
left join sys_user_role ur on ur.role_id = smcr.role_id
where smc.del_flag = 0
- and (ur.user_id = #{currentUserId} or smcr.user_id = #{currentUserId} or smcr.role_id is null)
+ and (ur.user_id = #{currentUserId} or smcr.user_id = #{currentUserId})
<if test="activeProjectId != null"> and smc.project_id = #{activeProjectId}</if>
<if test="menuType != null and menuType != ''"> and smc.menu_type = #{menuType}</if>
order by smc.menu_sort asc
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysRoleMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysRoleMapper.xml
index d12530b3..4b811740 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysRoleMapper.xml
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysRoleMapper.xml
@@ -80,12 +80,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
order by r.role_sort
</select>
+ <!-- select distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly,-->
+ <!-- r.status, r.del_flag, r.create_time, r.remark-->
+ <!-- from sys_role r-->
+ <!-- left join sys_role_dept rd on rd.role_id = r.role_id-->
+ <!-- where r.del_flag = '0' and (rd.dept_id = ${deptId} or FIND_IN_SET(rd.dept_id,(select ancestors from sys_dept where del_flag='0' and dept_id=${deptId})))-->
+ <!-- order by r.role_sort-->
<select id="findDeptRoleListByDeptId" parameterType="Long" resultMap="SysRoleResult">
select distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly,
r.status, r.del_flag, r.create_time, r.remark
from sys_role r
left join sys_role_dept rd on rd.role_id = r.role_id
- where r.del_flag = '0' and (rd.dept_id = ${deptId} or FIND_IN_SET(rd.dept_id,(select ancestors from sys_dept where del_flag='0' and dept_id=${deptId})))
+ where r.del_flag = '0' and rd.dept_id = ${deptId}
order by r.role_sort
</select>
diff --git a/yanzhu-ui-app/miniprogram/pages/components/file-uploader/index.wxss b/yanzhu-ui-app/miniprogram/pages/components/file-uploader/index.wxss
index bb2866b7..11d8681a 100644
--- a/yanzhu-ui-app/miniprogram/pages/components/file-uploader/index.wxss
+++ b/yanzhu-ui-app/miniprogram/pages/components/file-uploader/index.wxss
@@ -58,7 +58,7 @@
height:180rpx;
border: 1px dashed #28345a;
border-radius: 10rpx;
- background: #28345a url("https://xiangguan.sxyanzhu.com/profile/xmgl/static/z_card.png") no-repeat center/100%;
+ background: #28345a url("https://xiangguan.sxyanzhu.com/profile/static/z_card.png") no-repeat center/100%;
}
.in-fcard-click{
@@ -66,7 +66,7 @@
height:180rpx;
border: 1px dashed #28345a;
border-radius: 10rpx;
- background: #28345a url("https://xiangguan.sxyanzhu.com/profile/xmgl/static/f_card.png") no-repeat center/100%;
+ background: #28345a url("https://xiangguan.sxyanzhu.com/profile/static/f_card.png") no-repeat center/100%;
}
.in-img-div image{
diff --git a/yanzhu-ui-app/miniprogram/pages/login/login.wxml b/yanzhu-ui-app/miniprogram/pages/login/login.wxml
index b32c2538..05444c70 100644
--- a/yanzhu-ui-app/miniprogram/pages/login/login.wxml
+++ b/yanzhu-ui-app/miniprogram/pages/login/login.wxml
@@ -1,12 +1,13 @@
<!--pages/login/login.wxml-->
<view class="login_logo">
- <image wx:if="{{false}}" src="https://xiangguan.sxyanzhu.com/profile/xmgl/static/sys_logo.png"></image>
+ <image wx:if="{{false}}" src="https://xiangguan.sxyanzhu.com/profile/static/sys_logo.png"></image>
</view>
<view class="login_title">
<text>数字工程项目管理系统</text>
</view>
<view wx:if="{{false}}" class="loadings">
- <image src="/images/loading_i.gif"></image>
+ <!-- <image src="/images/loading_i.gif"></image> -->
+ <image src="/images/loading.gif"></image>
</view>
<view class="login_bg">
<view class="login_ex">请使用手机号登录</view>
diff --git a/yanzhu-ui-app/miniprogram/pages/project_qr/index.wxml b/yanzhu-ui-app/miniprogram/pages/project_qr/index.wxml
index 8649c2d2..958165f3 100644
--- a/yanzhu-ui-app/miniprogram/pages/project_qr/index.wxml
+++ b/yanzhu-ui-app/miniprogram/pages/project_qr/index.wxml
@@ -1,7 +1,7 @@
<!-- 游客一键登录 -->
<view wx:if="{{!userPhoneNumber}}" class="page">
<view class="login_logo">
- <image wx:if="{{false}}" src="https://xiangguan.sxyanzhu.com/profile/xmgl/static/sys_logo.png"></image>
+ <image wx:if="{{false}}" src="https://xiangguan.sxyanzhu.com/profile/static/sys_logo.png"></image>
</view>
<view class="login_title">
<text>数字工程项目管理系统</text>
diff --git a/yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdepts/index.vue b/yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdepts/index.vue
index 2a5920ba..7fd59e69 100644
--- a/yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdepts/index.vue
+++ b/yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdepts/index.vue
@@ -375,6 +375,7 @@ function submitForm() {
proxy.$refs["proProjectInfoSubdeptsRef"].validate(valid => {
if (valid) {
form.value.subDeptInfos = JSON.stringify(form.value.subDeptInfos);
+ form.value.leaderUserInfos = JSON.stringify(form.value.leaderUserInfos);
if (form.value.id != null) {
updateProProjectInfoSubdepts(form.value).then(response => {
proxy.$modal.msgSuccess("修改成功");
diff --git a/yanzhu-ui-vue3/src/views/manage/wxMenuConfig/index.vue b/yanzhu-ui-vue3/src/views/manage/wxMenuConfig/index.vue
index 419201cb..b3a103c7 100644
--- a/yanzhu-ui-vue3/src/views/manage/wxMenuConfig/index.vue
+++ b/yanzhu-ui-vue3/src/views/manage/wxMenuConfig/index.vue
@@ -55,7 +55,7 @@
>
<el-tab-pane label="全部" name="all" />
<el-tab-pane label="安全管理" name="aqgl" />
- <el-tab-pane label="质量管理" name="zhgl" />
+ <el-tab-pane label="质量管理" name="zlgl" />
<el-tab-pane label="项目管理" name="gdgn" />
</el-tabs>
<el-table v-loading="loading" :data="wxMenuConfigList" @selection-change="handleSelectionChange">