Merge remote-tracking branch 'origin/main'

srs-workstudy/src/main/java/com/srs/workstudy/domain/QgzxMoney.java

@@ -175,6 +175,13 @@ public class QgzxMoney {
     @TableField("apply_no")
     public String applyNo;
 
+    /**
+     * 指导老师
+     */
+    @ApiModelProperty("指导老师")
+    @TableField("zdls_name")
+    public String zdlsName;
+
     /**
      * 申请时间
      */

srs-workstudy/src/main/java/com/srs/workstudy/service/impl/QgzxMoneyServiceImpl.java

@@ -704,7 +704,16 @@ public class QgzxMoneyServiceImpl extends ServiceImpl<QgzxMoneyMapper, QgzxMoney
 
     @Override
     public List<QgzxMoney> listView(QgzxMoney param) {
-        return qgzxMoneyMapper.listView(param);
+        List<QgzxMoney> list = qgzxMoneyMapper.listView(param);
+        list.forEach(x -> {
+            if (x.getApplyNo() != null && !x.getApplyNo().isEmpty()) {
+                SysUser user = _userMapper.selectUserByUserName(x.getApplyNo());
+                if (user != null) {
+                    x.setZdlsName(user.getNickName());
+                }
+            }
+        });
+        return list;
     }