Przeglądaj źródła

Merge branch 'test' of jishutao/kede-server into prod

anderx 5 lat temu
rodzic
commit
ebedcd541b

+ 1 - 0
src/main/java/com/goafanti/common/task/PatentTask.java

@@ -100,6 +100,7 @@ public class PatentTask {
 						n.setContent(str2+",管理员="+a.getName());
 						nlist.add(n);
 						//再发一条给管理员
+						n.setId(UUID.randomUUID().toString());
 						n.setAid(a.getId());
 						nlist.add(n);
 							continue;

+ 2 - 2
src/main/java/com/goafanti/personnel/service/impl/PersonnelServiceImpl.java

@@ -311,7 +311,7 @@ public class PersonnelServiceImpl  extends BaseMybatisDao<PersonnelDossierMapper
     				case "星级": o = ob.getStarName(); break;
     				case "入职时间": o = ob.getEntryTimes(); break;
     				case "转正时间": o = ob.getPromotionTimes(); break;
-    				case "年龄": o = ob.getAge().toString(); break;
+    				case "年龄": o = ob.getAge()==null?"":ob.getAge().toString(); break;
     				case "性别": o = ob.getSex()==0?"男":"女"; break;
     				case "婚否": o = ob.getMarriageName(); break;
     				case "子女": o = ob.getSon().toString()+"/"+ob.getGirl().toString(); break;
@@ -333,7 +333,7 @@ public class PersonnelServiceImpl  extends BaseMybatisDao<PersonnelDossierMapper
     				case "联系电话": o = ob.getMobile(); break;
     				case "办公室电话": o = ob.getFixedTel(); break;
     				case "出生日期": o = ob.getBirthdays(); break;
-    				case "出生月份": o = ob.getMonth().toString(); break;
+    				case "出生月份": o = ob.getMonth()==null?"":ob.getMonth().toString(); break;
     				case "身份证号码": o = ob.getIdCard(); break;
     				case "身份证发证地": o = ob.getCertificationAuthority(); break;
     				case "户籍所在地": o = ob.getResidenceName(); break;

+ 2 - 2
src/main/resources/props/config_local.properties

@@ -60,12 +60,12 @@ template.cacheable=false
 portal.host=//sf.jishutao.com/portal/2.0.6
 avatar.upload.host=//sb.jishutao.com/upload
 #连接开发
-#static.host=//sb.jishutao.com/1.1.41
+#static.host=//sb.jishutao.com/1.1.42
 #avatar.host=//sb.jishutao.com
 
 #连测试
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.1.41
+static.host=//static.jishutao.com/1.1.42
 
 upload.path=F:/data/public/upload
 upload.private.path=F:/data/private/upload

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -54,7 +54,7 @@ session.validate.timespan=18000000
 app.name=AFT
 template.cacheable=false
 
-static.host=//static.jishutao.com/1.1.41
+static.host=//static.jishutao.com/1.1.42
 portal.host=//static.jishutao.com/portal/2.0.6
 avatar.host=//static.jishutao.com
 avatar.upload.host=//static.jishutao.com/upload