凌云集团更改公司

admin-ui/app/whepi/home/home.js

@@ -132,8 +132,8 @@ define(function (require) {
                                     labelWidth: '120px',
                                     onChange: function (value) {
                                         if (!isNotNullOrEmpty(value)) {
-                                            $form.formSet({
-                                                userId: ''
+                                            $form1.formSet({
+                                                uptownId: ''
                                             })
                                         }
                                     },
@@ -196,8 +196,8 @@ define(function (require) {
                                     labelWidth: '120px',
                                     onChange: function (value) {
                                         if (!isNotNullOrEmpty(value)) {
-                                            $form.formSet({
-                                                userId: ''
+                                            $form2.formSet({
+                                                unitId: ''
                                             })
                                         }
                                     },

admin-ui/app/whepi/lingyun/lingyunUser.js

@@ -12,6 +12,18 @@ define(function (require) {
         }
       }
 
+      // 弹框的方式
+      var widgets = {
+        // 搜索分类检索
+        selectTableUnit: {
+          url: 'app/whepi/home/selectLYbumen.js',
+          bind: {
+            unitId: 'unitId',
+            unit: 'unit',
+          },
+        },
+      };
+
       //　检索条件查询
       function queryGrid1() {
         var queryForm = $form.formGet();
@@ -53,10 +65,28 @@ define(function (require) {
             xtype: 'textbox',
             label: '检索条件',
             name: 'queryProperties',
-            prompt: "小区名称/用户名称/电话号码",
+            prompt: "用户名称/电话号码",
             labelWidth: 'auto',
             events: {keydown: enterQueryGrid1}, width: 350
           },
+          {xtype: 'hidden', name: 'unitId'},
+          {
+            xtype: 'searchbox',
+            label: '部门',
+            name: 'unit',
+            prompt: "部门",
+            width: '400px',
+            widget: widgets.selectTableUnit,// 弹出框方法
+            labelWidth: '120px',
+            onChange: function (value) {
+              if (!isNotNullOrEmpty(value)) {
+                $form.formSet({
+                  unitId : ''
+                })
+              }
+              queryGrid1();
+            },
+          },
         ]]
       };
 

whepi-web/src/main/resources/mapper/SweepCodeMapper.xml

@@ -52,9 +52,11 @@
      inner join sys_uptown e on e.uptown_id = d.uptown_id and e.uptown_id = 1238790987234
         <where>
          <if test="queryProperties != null and queryProperties != ''">
-          e.uptown_name like concat('%',#{queryProperties},'%')
-          or a.linkman like concat('%',#{queryProperties},'%')
-          or a.phone like concat('%',#{queryProperties},'%')
+          (a.linkman like concat('%',#{queryProperties},'%')
+          or a.phone like concat('%',#{queryProperties},'%'))
+         </if>
+         <if test="unitId != null and unitId != ''">
+            and d.unit_id = #{unitId}
          </if>
         </where>
     </select>