From 08b1e453b47d63b68234bcdbad491a7b5ac3dc42 Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期一, 07 一月 2019 16:10:45 +0800
Subject: [PATCH] 权限管理页面中添加基站审批权限以及添加国际化文本

---
 gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java b/gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java
index ad7b2aa..97ecdc4 100644
--- a/gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java
+++ b/gx_tieta/src/com/fgkj/dao/impl/Battinf_applyImpl.java
@@ -296,7 +296,12 @@
 		if(bapply.getApply_en()==0) {
 			sql+=" apply_en=?  and check_en!=? ";
 		}else {
-			sql+=" apply_en=?  and check_en=? ";
+			if(bapply.getCheck_en()==1) {
+				sql+=" apply_en=?  and check_en=? ";
+			}else {
+				sql+=" apply_en=?  and check_en!=? and check_en!=1 ";
+			}
+			
 		}
 	    sql+=" order by apply_date desc limit ?,?";
 		List<Battinf_apply> list=DAOHelper.executeQueryLimit(sql, conn, new Object[]{bapply.getApply_en(),bapply.getCheck_en(),(page.getPageCurr()-1)*page.getPageSize(),page.getPageSize()}, new CallBack() {

--
Gitblit v1.9.1