1.1.2上线bug修复

src/main/java/com/jeeplus/modules/api/hpposition/entity/HpGoodmoneyPositionAPI.java

@@ -520,8 +520,16 @@ public class HpGoodmoneyPositionAPI extends DataEntity<HpGoodmoneyPositionAPI> {
     public String getReward() {
         if (getMaleReward() != null && getFemaleReward() != null) {
             if (getMaleReward().equals(getFemaleReward())) {
-                return String.valueOf(getMaleReward());
+                if (getMaleReward() != 0) {
+                    return String.valueOf(getMaleReward());
+                }
             } else {
+                if (getMaleReward() == 0) {
+                    return "女返" + getFemaleReward();
+                }
+                if (getFemaleReward() == 0) {
+                    return "男返" + getMaleReward();
+                }
                 return "男返" + getMaleReward() + ",女返" + getFemaleReward();
             }
         }

src/main/java/com/jeeplus/modules/api/hpposition/entity/HpGroupPositionAPI.java

@@ -528,16 +528,27 @@ public class HpGroupPositionAPI extends DataEntity<HpGroupPositionAPI> {
         //拼团最高奖励返回
         if (getMaleReward() != null && getFemaleReward() != null) {
             if (getMaleReward().equals(getFemaleReward())) {
+                Integer male = getMaleReward();
                 if (getFiveGroupCashback() != null) {
-                    Integer male = getMaleReward() + getFiveGroupCashback();
+                    male = male + getFiveGroupCashback();
+                }
+                if (male != 0) {
                     return String.valueOf(male);
                 }
             } else {
+                Integer male = getMaleReward();
+                Integer female = getFemaleReward();
                 if (getFiveGroupCashback() != null) {
-                    Integer male = getMaleReward() + getFiveGroupCashback();
-                    Integer female = getFemaleReward() + getFiveGroupCashback();
-                    return "男返" + male + ",女返" + female;
+                    male = male + getFiveGroupCashback();
+                    female = female + getFiveGroupCashback();
+                }
+                if (male == 0) {
+                    return "女返" + female;
+                }
+                if (female == 0) {
+                    return "男返" + male;
                 }
+                return "男返" + male + ",女返" + female;
             }
         } else if (getFiveGroupCashback() != null && getThreeGroupCashback() != null) {
             Integer male = getFiveGroupCashback();

src/main/java/com/jeeplus/modules/api/hpposition/entity/HpRewardPositionAPI.java

@@ -501,8 +501,16 @@ public class HpRewardPositionAPI extends DataEntity<HpRewardPositionAPI> {
     public String getReward() {
         if (getMaleReward() != null && getFemaleReward() != null) {
             if (getMaleReward().equals(getFemaleReward())) {
-                return String.valueOf(getMaleReward());
+                if (getMaleReward() != 0) {
+                    return String.valueOf(getMaleReward());
+                }
             } else {
+                if (getMaleReward() == 0) {
+                    return "女返" + getFemaleReward();
+                }
+                if (getFemaleReward() == 0) {
+                    return "男返" + getMaleReward();
+                }
                 return "男返" + getMaleReward() + ",女返" + getFemaleReward();
             }
         }

src/main/java/com/jeeplus/modules/hpposition/entity/HpPositionCommon.java

@@ -42,7 +42,7 @@ public class HpPositionCommon extends DataEntity<HpPositionCommon> {
     private Date groupEndTime;        // 拼团结束时间（岗位招聘结束时间）
     private String settlementMethodValue;   //结算方式value(用于查询)
     private String welfare;  //自发布岗位福利（0：包住宿 1：包工作餐 2：交通补助 3：加班补助 4：有提成 5：奖金 6：转正机会 7.五险一金），可多选，数组存储
-    private String hasRegularBus;		// 自发布班车（全职）（0：没有 1：有）
+    private String hasRegularBus;        // 自发布班车（全职）（0：没有 1：有）
     private String salaryPeriod;  //自发布薪资周期（兼职）（0：天 1：周 2：月：3 次 4：时 5：其他）
 
     public HpPositionAddress getHpPositionAddress() {
@@ -142,16 +142,27 @@ public class HpPositionCommon extends DataEntity<HpPositionCommon> {
     public String getReward() {
         if (getMaleReward() != null && getFemaleReward() != null) {
             if (getMaleReward().equals(getFemaleReward())) {
+                Integer male = getMaleReward();
                 if (getFiveGroupCashback() != null) {
-                    Integer male = getMaleReward() + getFiveGroupCashback();
+                    male = male + getFiveGroupCashback();
+                }
+                if (male != 0) {
                     return String.valueOf(male);
                 }
             } else {
+                Integer male = getMaleReward();
+                Integer female = getFemaleReward();
                 if (getFiveGroupCashback() != null) {
-                    Integer male = getMaleReward() + getFiveGroupCashback();
-                    Integer female = getFemaleReward() + getFiveGroupCashback();
-                    return "男返" + male + ",女返" + female;
+                    male = male + getFiveGroupCashback();
+                    female = female + getFiveGroupCashback();
+                }
+                if (male == 0) {
+                    return "女返" + female;
                 }
+                if (female == 0) {
+                    return "男返" + male;
+                }
+                return "男返" + male + ",女返" + female;
             }
         }
         return reward;
@@ -198,8 +209,8 @@ public class HpPositionCommon extends DataEntity<HpPositionCommon> {
     }
 
     public String getRegularBus() {
-        if(StringUtils.isNotBlank(hasRegularBus)){
-            if("0".equals(hasRegularBus)){
+        if (StringUtils.isNotBlank(hasRegularBus)) {
+            if ("0".equals(hasRegularBus)) {
                 return null;
             }
             regularBus = DictUtils.getDictLabel(hasRegularBus, "hasRegularBus", "");
@@ -260,7 +271,7 @@ public class HpPositionCommon extends DataEntity<HpPositionCommon> {
     public String getSalary() {
         if (StringUtils.isNotBlank(salaryPeriod)) {
             //周结或者日结
-            String salaryPeriod1="";
+            String salaryPeriod1 = "";
             if ("0".equals(salaryPeriod) || "1".equals(salaryPeriod)) {
                 salaryPeriod1 = DictUtils.getDictLabel(salaryPeriod, "salaryPeriod", "");
                 salary = salary + "元/" + salaryPeriod1;
@@ -416,7 +427,7 @@ public class HpPositionCommon extends DataEntity<HpPositionCommon> {
     }
 
     public String getHasRegularBus() {
-        if(StringUtils.isNotBlank(hasRegularBus)){
+        if (StringUtils.isNotBlank(hasRegularBus)) {
             if ("0".equals(hasRegularBus)) {
                 return null;
             }

src/main/resources/properties/jeeplus.properties

@@ -185,4 +185,4 @@ wxappsecret=718ca69a4adbe35e566b10fb3bfe8f7b
 #wxappsecret=d4624c36b6795d1d99dcf0547af5443d
 
 ############################ \u63A5\u53E3\u8FD4\u56DEmsg###############################
-noLogin=\u5E94\u7528\u5BA1\u6838\u4E2D\uFF0C\u8BF7\u7A0D\u540E\u518D\u8BD5
+noLogin=\u7528\u6237\u672A\u767B\u5F55

src/main/webapp/webpage/modules/sys/login/sysLogin.jsp

@@ -186,7 +186,7 @@
 		<div class="login-page">
 		<div class="row">
 			<div class="bgg">
-				<img  class="img-circle" src="${ctxStatic}/common/images/happyjob_logo.png" class="user-avatar" style="height: 180px;width: 180px;"/>
+				<img  class="img-circle" src="${ctxStatic}/common/images/happyjob_logo.png" class="user-avatar" style="height: 96px;width: 96px;"/>
 				<h2 class="title">开心工作管理平台</h2>
 				<sys:message content="${message}" showType="1"/>
 				<div class="bgg">