git-svn-id: https://192.168.57.71/svn/jsgkj@1262 931142cf-59ea-a443-aa0e-51397b428577

gkjsjy/trunk/WebContent/static/biz/js/gkjsgl/jsjdbg/jsjdbgdsdetail.js

@@ -660,7 +660,7 @@ function pageinfo4(){
         jsjdbgds.detail.xmxxxz();
     });
     $("#pagesize").val($("#pagesize").attr("num"));
-    $("#pagefirst").click(function() {
+    $("#pagefirst").unbind('click').click(function() {
         if ($("#pagecur").val() == 1) {
         	$.alert({
     		    title: '提示',
@@ -673,7 +673,7 @@ function pageinfo4(){
             jsjdbgds.detail.xmxxxz();
         }
     });
-    $("#pageprev").click(function() {
+    $("#pageprev").unbind('click').click(function() {
         if ($("#pagecur").val() == 1) {
         	$.alert({
     		    title: '提示',
@@ -702,7 +702,7 @@ function pageinfo4(){
                     jsjdbgds.detail.xmxxxz();
                 }
             });
-    $("#pagenext").click(function() {
+    $("#pagenext").unbind('click').click(function() {
         if(parseInt($("#pagetotal").val())<=1){
         	$.alert({
     		    title: '提示',
@@ -722,7 +722,7 @@ function pageinfo4(){
             jsjdbgds.detail.xmxxxz();
         }
     });
-    $("#pagelast").click(function() {
+    $("#pagelast").unbind('click').click(function() {
         if(parseInt($("#pagetotal").val())<=1){
         	$.alert({
     		    title: '提示',

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/jyrjbxx/ctl/GkjyrCtl.java

@@ -1662,16 +1662,25 @@ public class GkjyrCtl extends BaseWebCtl {
 				vo.setMtsfwars(entity.getMtsfwars() != null ? entity.getMtsfwars().getId() : "");
 				vo.setXkzid(entity.getXkzid() != null ? entity.getXkzid() : "");
 				vo.setFwlxzw(entity.getFwlx() != null ? entity.getFwlx().getText() : "");
-				vo.setMtytzw("");
-				if(StringUtils.isNotEmpty(entity.getMtyt())){
-					String [] mtyts = entity.getMtyt().split(",");
-					for(int i = 0; i < mtyts.length; i++){
-						vo.setMtytzw(vo.getMtytzw()+","+securityMgr.codeService().findOne(mtyts[i]).getText());
+
+				String mtytName = "";
+				if (entity.getMtyt() != null) {
+					String[] mtytNameArray = entity.getMtyt().split(",");
+					/*
+					 * for (String m : mtytNameArray) { mtytName +=
+					 * codeService.findOne(m).getText() + " "; mtytName +=
+					 * securityMgr.codeService().findOne(m).getText() + " "; }
+					 */
+					for (int i = 0; i < mtytNameArray.length; i++) {
+						if (i != mtytNameArray.length - 1) {
+							mtytName += securityMgr.codeService().findOne(mtytNameArray[i]).getText() + ",";
+						} else {
+							mtytName += securityMgr.codeService().findOne(mtytNameArray[i]).getText();
+						}
+
 					}
-					vo.setMtytzw(vo.getMtytzw().substring(1, vo.getMtytzw().length()));
 				}
-
-				vo.setMtytzw(entity.getMtyt() != null ? entity.getMtyt() : "");
+				vo.setMtytzw(mtytName);
 
 				XkzglbEntity xkzglb = xkzglbService.findByCzidAndYwid(czid, entity.getId());
 				if (xkzglb != null) {
@@ -1730,15 +1739,24 @@ public class GkjyrCtl extends BaseWebCtl {
 				vo.setSsmtzw(entity.getSsmt() != null ? entity.getSsmt().getMtmc() : "");
 				vo.setXkzid(entity.getXkzid() != null ? entity.getXkzid() : "");
 				vo.setSsjyrzw(entity.getSsjyr() != null ? entity.getSsjyr().getGkjyr() : "");
-				vo.setBwytzw("");
-				if(StringUtils.isNotEmpty(entity.getBwyt())){
-					String [] bwyts = entity.getBwyt().split(",");
-					for(int i = 0; i < bwyts.length; i++){
-						vo.setBwytzw(vo.getBwytzw()+","+securityMgr.codeService().findOne(bwyts[i]).getText());
+				if (entity.getBwyt() != null) {
+					String bwytzw = "";
+					String[] s = entity.getBwyt().split(",");
+					/*
+					 * for (String string : s) { bwytzw +=
+					 * securityMgr.codeService().findOne(string).getText(); }
+					 */
+					for (int i = 0; i < s.length; i++) {
+						CodeEntity ce = securityMgr.codeService().findOne(s[i]);
+						if (ce != null) {
+							bwytzw += ce.getText();
+							if (i != s.length - 1) {
+								bwytzw += ",";
+							}
+						}
 					}
-					vo.setBwytzw(vo.getBwytzw().substring(1, vo.getBwytzw().length()));
+					vo.setBwytzw(bwytzw);
 				}
-				vo.setBwytzw(entity.getBwyt() != null ? entity.getBwyt() : "");
 				vo.setWxpbwzw(entity.getWxpbw() != null ? entity.getWxpbw().getText() : "");
 				vo.setSfdwkfzw(entity.getSfdwkf() != null ? entity.getSfdwkf().getText() : "");
 				XkzglbEntity xkzglb = xkzglbService.findByCzidAndYwid(czid, entity.getId());