发票管理权限修改

src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectMessageService.java

@@ -384,7 +384,9 @@ public class RuralProjectMessageService extends CrudService<RuralProjectMessageD
 
         if(null!= info.getWorkContractInfo()){
             projectRecordTreeData.setContractName(info.getWorkContractInfo().getName());
-            projectRecordTreeData.setClientName(info.getWorkContractInfo().getClient().getName());
+            if(null != info.getWorkContractInfo().getClient()){
+                projectRecordTreeData.setClientName(info.getWorkContractInfo().getClient().getName());
+            }
         }else{
             projectRecordTreeData.setContractName("");
             projectRecordTreeData.setClientName("");

src/main/java/com/jeeplus/modules/workinvoice/web/WorkInvoiceController.java

@@ -134,18 +134,6 @@ public class WorkInvoiceController extends BaseController {
 	public String list(WorkInvoice workInvoice, HttpServletRequest request, HttpServletResponse response, Model model) {
 		Page<WorkInvoice> page = workInvoiceService.findPage(new Page<WorkInvoice>(request, response), workInvoice);
 		List<WorkInvoice> workInvoiceList = page.getList();
-		for (WorkInvoice info: workInvoiceList) {
-			if(UserUtils.getUser().getOffice().getName().equals("财务部") || UserUtils.getUser().getId().equals(info.getCreateBy().getId())){
-				info.setCancellation("1");
-			}else{
-				info.setCancellation("0");
-			}
-			if(UserUtils.isManager()){
-				info.setAdminFlag("1");
-			}else{
-				info.setAdminFlag("0");
-			}
-		}
 		model.addAttribute("page", page);
 		model.addAttribute("workInvoiceShow", workInvoice);
 		return "modules/workinvoice/workInvoiceList";

src/main/webapp/webpage/modules/workinvoice/workInvoiceList.jsp

@@ -661,18 +661,27 @@
 							<c:when test="${workInvoice.invoiceState == '7'}">"是"</c:when>
 					<c:otherwise>"否"</c:otherwise>
 					</c:choose>
-					,"cancellationFlag":<c:choose>
-							<c:when test="${workInvoice.invoiceState == 5 && workInvoice.cancellation == '1'}">"1"</c:when>
-					<c:otherwise>"0"</c:otherwise>
-					</c:choose>
-					,"financeFlag":<c:choose>
-							<c:when test="${workInvoice.invoiceState == 5 && workInvoice.cancellation == '1' && workInvoice.receiptMoney == '否'}">"1"</c:when>
-					<c:otherwise>"0"</c:otherwise>
-					</c:choose>
-					,"adminFlag":<c:choose>
-							<c:when test="${workInvoice.invoiceState == 5 && workInvoice.adminFlag == '1'}">"1"</c:when>
-					<c:otherwise>"0"</c:otherwise>
-					</c:choose>
+					<shiro:hasPermission name="workinvoice:workInvoice:receipt">
+						,"financeFlag":
+							<c:choose>
+								<c:when test="${workInvoice.invoiceState == 5 && workInvoice.receiptMoney == '否'}">"1"</c:when>
+								<c:otherwise>"0"</c:otherwise>
+						</c:choose>
+					</shiro:hasPermission>
+					<shiro:hasPermission name="workinvoice:workInvoice:invalid">
+						,"cancellationFlag":
+							<c:choose>
+								<c:when test="${workInvoice.invoiceState == 5}">"1"</c:when>
+								<c:otherwise>"0"</c:otherwise>
+						</c:choose>
+					</shiro:hasPermission>
+					<shiro:hasPermission name="workinvoice:workInvoice:adminDel">
+						,"adminFlag":
+							<c:choose>
+								<c:when test="${workInvoice.invoiceState == 5}">"1"</c:when>
+								<c:otherwise>"0"</c:otherwise>
+						</c:choose>
+					</shiro:hasPermission>
                 }
                 </c:forEach>
                 </c:if>