指纹比中单位查询修改，足迹比中详情页面

src/main/java/com/founder/khtj/controller/KhtjController.java

@@ -60,8 +60,8 @@ public class KhtjController {
             String unit_matchstring = "";
             if (rccdw == null || "".equals(rccdw)) {
                 if("".equals(user.getUnitcode())||user.getUnitcode() == null){
-                    rccdw = "430000000000";
-                    rstBean.setRCcdw("430000000000");
+                    rccdw = "460000000000";
+                    rstBean.setRCcdw("460000000000");
                 }else{
                     rccdw = user.getUnitcode();
                     rstBean.setRCcdw(user.getUnitcode());

src/main/resources/mapper/ZjbzxxSqlMapper.xml

@@ -58,9 +58,7 @@
         AJLB,
         JYAQ,
         FASJ,
-        XYRZJTP as ZPSJ0,
         BZXYRZJBW,
-        AJZJTP AS ZPSJ1,
         BZAJZJXH,
         BZDW,
         BZSJ,

src/main/resources/templates/rygl/addryxx.html

@@ -1178,6 +1178,10 @@
                 return;
             }
             zwcjjss++;
+            if(ifzw==5){
+                window.open ("http://10.184.14.133:8089/#/fingerprintIndex6/"+$("#rybh").val()+"/"+$('#username').val());
+                return;
+            }
             if(ifgk==1){
                 //高科指纹采集
                 gkscanperson();
@@ -1540,7 +1544,7 @@
                         var rst = "";
                         console.log("设备权限验证结果：审批通过！");
                         console.log("所具备采集权限，指纹："+data.ifzwcjy+",二代证："+data.ifedzydq+",身高体重："+data.ifsftzzzcjy+",虹膜："+data.ifhmcjy+",足迹："+data.ifzjcjy+",声纹："+data.ifswcjy+",手机："+data.ifsjcjy);
-                        if(data.ifzwcjy=="否"){
+                        if(data.ifzwcjy=="否" || data.sfgq =='0'){
                             ifzw=-1;
                             $("#zw").find("a").removeAttr("href");
                             $("#zw").find("a").removeAttr("onclick");
@@ -2182,18 +2186,19 @@
             }
             //jAlert("功能维护升级中，请耐心等待！","提示");
         }
-        window.onmessage=function (e) {debugger
+        window.onmessage=function (e) {
             var e=e||event;
             //alert("返回值："+e.data);
             debugger;
-            // var rstdata = "";
-            var rstdata = $.parseJSON(e.result);
+            var rstdata =  $.parseJSON(e.data);
             // rstdata="{\"result\":{\"yyqsqkdm\":\"0\",\"zyqsqkdm\":\"1\",\"hmzp_yy\":\"sdas\",\"hmzp_zy\":\"sdasdas\",\"zy_xxzlpf\":\"67\",\"yy_xxzlpf\":\"84\"},\"status_code\":\"1000\",\"elaspsed_time\":\"0.998\",\"message\":\"全部\",\"version\":\"1.0\",\"request_id\":\"HM\"}";
             // rstdata = JSON.parse(rstdata);
             // rstdata =
             alert("虹膜采集状态："+rstdata.message);
             var rresult = rstdata.result;
 
+
+
             $("#hmqsqkRight").val(rresult.yyqsqkdm);
             $("#hmqsqkLeft").val(rresult.zyqsqkdm);
             $("#hmsjRight").val(rresult.hmzp_yy);

src/main/resources/templates/userPower/user.html

@@ -128,7 +128,7 @@
                     ,{field:'userGroup', title:'用户组',align:'center',templet:function(row){
                         var value="";
                         if (row.userGroup ==null){
-                          return  null;
+                          return  '';
                         }
                         var userGroup = row.userGroup.split(",");
                         for (let i = 0; i <userGroup.length ; i++) {
@@ -147,7 +147,7 @@
                     ,{field:'userPower', title:'用户权限',align:'center',templet:function(row){
                         var value="";
                         if (row.userPower ==null){
-                            return  null;
+                            return  '';
                         }
                         var userPower = row.userPower.split(",");
                         for (let i = 0; i <userPower.length ; i++) {

src/main/resources/templates/zwbzgl/iframe1.html

@@ -74,7 +74,7 @@
                             <td class="ar" width="13.3%">比中单位：</td>
                             <td width="20%">
                                 <span class="textbox">
-                                    <input type="text" style="height: 30px;" id="affirmunitcode" name="affirmunitcode" class="val easyui-combobox" data-options="url: '/queryTypeCode?type=CODE_UNIT',method:'get',textField : 'text', valueField : 'id'"/>
+                                    <input type="text" style="height: 30px;" id="affirmunitcode" name="affirmunitcode" class="val easyui-combotree" data-options="url: '/queryTypeCode?type=CODE_UNIT',method:'get',textField : 'text', valueField : 'id'"/>
                                 </span>
                             </td>
                         </tr>

src/main/resources/templates/zwbzgl/iframe2.html

@@ -51,7 +51,7 @@
                     <td class="ar" width="13.3%">比中单位：</td>
                     <td width="20%">
                                 <span class="textbox">
-                                    <input type="text" style="height: 30px;" id="affirmunitcode" name="affirmunitcode" class="val easyui-combobox" data-options="url: '/queryTypeCode?type=CODE_UNIT',method:'get',textField : 'text', valueField : 'id'"/>
+                                    <input type="text" style="height: 30px;" id="affirmunitcode" name="affirmunitcode" class="val easyui-combotree" data-options="url: '/queryTypeCode?type=CODE_UNIT',method:'get',textField : 'text', valueField : 'id'"/>
                                 </span>
                     </td>
                 </tr>