Merge branch '20221017_sun变更等级评定页面来源' of sckj/mz-cloud into master

ruoyi-modules/mz-business-djpd/src/main/java/com/ruoyi/business/domain/ZwywBgdjpdSq.java

@@ -134,4 +134,6 @@ public class ZwywBgdjpdSq extends BaseEntity
     @TableField(exist = false)
     private String xydm;
 
+    @TableField(exist = false)
+    private String ly;
 }

ruoyi-modules/mz-business-djpd/src/main/java/com/ruoyi/business/service/impl/ZwywBgdjpdSqServiceImpl.java

@@ -14,6 +14,7 @@ import com.ruoyi.system.api.enums.ChangeAppStatus;
 import com.ruoyi.system.api.enums.ExamineStatus;
 import com.ruoyi.system.api.enums.SysDeptJlStatus;
 import com.ruoyi.system.mapper.SysDeptJlMapper;
+import com.ruoyi.system.utils.SysUserTypeUtil;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -67,7 +68,10 @@ public class ZwywBgdjpdSqServiceImpl implements IZwywBgdjpdSqService
     public List<ZwywBgdjpdSq> selectZwywBgdjpdSqList(ZwywBgdjpdSq zwywBgdjpdSq)
     {
         List<ZwywBgdjpdSq> res = zwywBgdjpdSqMapper.selectZwywBgdjpdSqList(zwywBgdjpdSq);
-        res.forEach(r -> r.setXzqh(sysDeptJlMapper.getXzqhNames(r.getXzqh())));
+        res.forEach(r -> {
+            r.setXzqh(sysDeptJlMapper.getXzqhNames(r.getXzqh()));
+            r.setLy(SysUserTypeUtil.getSysUserType(r.getCreateUserType()));
+        });
         return res;
     }
 

ruoyi-ui/src/views/business/fwjggl/djpd/bgdjpdSh/index.vue

@@ -102,6 +102,7 @@
           <dict-tag :options="dict.type.CZ018" :value="scope.row.sqbgzt"/>
         </template>
       </el-table-column>
+      <el-table-column label="来源" align="center" prop="ly" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
           <el-button

ruoyi-ui/src/views/business/fwjggl/djpd/bgdjpdSq/index.vue

@@ -74,6 +74,7 @@
           <dict-tag :options="dict.type.CZ018" :value="scope.row.sqbgzt" />
         </template>
       </el-table-column>
+      <el-table-column label="来源" align="center" prop="ly" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleDetails(scope.row)"

ruoyi-ui/src/views/organization/zwyw/djpdsq/bgdjpdSq/index.vue

@@ -73,6 +73,7 @@
           <dict-tag :options="dict.type.CZ018" :value="scope.row.sqbgzt" />
         </template>
       </el-table-column>
+      <el-table-column label="来源" align="center" prop="ly" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleDetails(scope.row)"