Merge remote-tracking branch 'origin/zhouwq' into develop

WebContent/jwapp/pages/bgmk/js/bgmkTab.js

@@ -68,7 +68,7 @@ var is_column = [ [
 						return getCodeName(v_typequery_data.rowSet, value);
 					}
 				},
-				{field : 'CREATOR_ID',title : '创建人员',width : 100,align : 'center'},
+				{field : 'CREATE_ID',title : '创建人员',width : 100,align : 'center'},
 				{field : 'CREATE_TIME',title : '创建时间',width : 100,align : 'center'}
 				] ];
 //列表加载完成回调

src_jwapp/com/jw/app/bgmk/viewAction.java

@@ -8,18 +8,8 @@ import com.gaowj.business.util.RequestUtils;
 
 public class viewAction extends BasicAction {
 
-
-
-	/**
-	 * 
-	 */
 	private static final long serialVersionUID = 847847227972540472L;
 	
-	/**
-	 * 
-	 */
-
-	
 	public String bgmkTab() throws BusinessException{
 		return "bgmkTab";
 	}

src_jwapp/com/jw/app/business/bgmk/bgmkDAO.xml

@@ -45,6 +45,7 @@
 		</where>
 	</sql>
 
+
 	<insert id="insert_bgmk" parameterType="map">
 		insert into WORK_BG(
 		<trim prefix="" suffixOverrides=",">
@@ -100,7 +101,7 @@
 		 <![CDATA[
 		   select count(*) c from WORK_BG f where 1=1 
 	     ]]>
-		<include refid="where_send" />
+		<include refid="where_bg" />
 	</select>