提交部分代码明显bug

src/main/java/platform/modules/company/service/StockLandApproveService.java

@@ -49,12 +49,7 @@ import platform.modules.sys.service.WaitToDoService;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 /**
  * 存量用地审核Service
@@ -621,13 +616,25 @@ public class StockLandApproveService extends BaseService<StockLand> {
 				apply.setApprove_status(apply.getTemporary_state());
 			}
 
-			if(apply.getApprove_status().equals(Constant.LandApproveStatus.REJECT)) {
+			// 不建议这种写法，会出现空指针
+//			if(apply.getApprove_status().equals(Constant.LandApproveStatus.REJECT)) {
+//				apply.setApply_status(Constant.LandApplyStatus.REJECT);
+//			}else if(apply.getApprove_status().equals(Constant.LandApproveStatus.APPROVED)) {
+//				apply.setApply_status(Constant.LandApplyStatus.APPROVED);
+//				apply.setProcess_status(Constant.ProcessStatus.IN_PROGRESS);
+//			}else if(apply.getApprove_status().equals(Constant.LandApproveStatus.NOTAPPROVED)) {
+//				apply.setApply_status(Constant.LandApplyStatus.NOTAPPROVED);
+//			}
+
+			if(Objects.equals(apply.getApprove_status(), Constant.LandApproveStatus.REJECT)) {
 				apply.setApply_status(Constant.LandApplyStatus.REJECT);
-			}else if(apply.getApprove_status().equals(Constant.LandApproveStatus.APPROVED)) {
+			}else if(Objects.equals(apply.getApprove_status(), Constant.LandApproveStatus.APPROVED)) {
 				apply.setApply_status(Constant.LandApplyStatus.APPROVED);
 				apply.setProcess_status(Constant.ProcessStatus.IN_PROGRESS);
-			}else if(apply.getApprove_status().equals(Constant.LandApproveStatus.NOTAPPROVED)) {
+			}else if(Objects.equals(apply.getApprove_status(), Constant.LandApproveStatus.NOTAPPROVED)) {
 				apply.setApply_status(Constant.LandApplyStatus.NOTAPPROVED);
+			} else {
+				throw new RuntimeException("单据的状态错误");
 			}
 			
 			stockLandService.updateSelective(apply);

src/main/java/platform/modules/government/service/LogoService.java

@@ -81,7 +81,6 @@ public class LogoService extends BaseService<Logo> {
             //更新其他logo
             if(null!=logo.getIs_start()&&logo.getIs_start()){
                 logoDao.updateOtherLogo(logo.getId());
-
             }
             attachmentDao.deleteByBusiness(Constant.Attachment.LOGO, logo.getId());
             attachmentDao.updateAttachment(Constant.Attachment.LOGO, logo.getId(), logo.getFileDown().getFile_id());

src/main/resources/templates/admin/company/projectMatters/apply_check.html

@@ -171,16 +171,14 @@
                 </div>
             </div>
         </div>
-        <!--<div class="line">流程信息</div>
+        <div class="line">流程信息</div>
         <div class="row cl">
             <div class="col-xs-8 col-sm-9 col-xs-offset-2 col-sm-offset-1">
                 <table class="table table-border table-bordered table-bg table-hover processTb">
                     <thead>
                     <tr class="text-c">
                         <th>时间</th>
-                        &lt;!&ndash; <th>审核状态</th> &ndash;&gt;
-                        <th>单位</th>
-                        <th>操作人</th>
+                        <th>审核状态</th>
                         <th>操作</th>
                         <th>审核意见</th>
                     </tr>
@@ -188,16 +186,14 @@
                     <tbody>
                     <tr class="text-c" th:each="model,iterStat:${approvalList}" th:object="${model}">
                         <td th:text="*{create_time}"></td>
-                        &lt;!&ndash; <td th:text="*{before_approvalstatus_str}"></td> &ndash;&gt;
-                        <td th:text="*{department}"></td>
-                        <td th:text="*{create_name}"></td>
+                        <td th:text="*{before_approvalstatus_str}"></td>
                         <td th:text="*{oper_type}"></td>
                         <td th:text="*{approval_comment}"></td>
                     </tr>
                     </tbody>
                 </table>
             </div>
-        </div>-->
+        </div>
         <div class="row cl">
             <div class="col-xs-8 col-sm-9 col-xs-offset-4 col-sm-offset-2">
                 <button onClick="removeIframe();" class="btn btn-default radius" type="button">&nbsp;&nbsp;返回&nbsp;&nbsp;</button>