yangdamao 1 year ago
parent
commit
deea476171

+ 1 - 1
zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -1976,7 +1976,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
 
                                     }
                                 }
-                                item.setApplyStatusStr(item.getApplyStatus() == 1 ? "通过":"不通过");
+                                item.setApplyStatusStr(ObjectUtils.isNotNull(item.getApplyStatus()) && item.getApplyStatus() == 1 ? "通过":"不通过");
                                 if (ObjectUtils.isNotNull(item.getPerformance())){
                                     item.setPerformanceStr(String.format("%s分",item.getPerformance()));
                                 }

+ 1 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserDataExcelBo.java

@@ -17,7 +17,7 @@ public class UserDataExcelBo implements Serializable {
     private String registerTime;
 
     @Excel(name = "学员编号")
-    private String studentCode;
+    private String userAccount;
 
     @Excel(name = "姓名")
     private String realname;