diff --git a/src/main/resources/mybatisMapper/EquipMapper.xml b/src/main/resources/mybatisMapper/EquipMapper.xml index 50881d1f..e442ca50 100644 --- a/src/main/resources/mybatisMapper/EquipMapper.xml +++ b/src/main/resources/mybatisMapper/EquipMapper.xml @@ -406,27 +406,55 @@ order by version_no asc limit 1 - + + + where cm.mgt_organ = oc.organ_cd + and cm.p_user_seq = ui.user_seq + and cm.mgt_organ in + + #{item} + + + and cm.mgt_organ = #{mgtOrgan} + + + and cm.tel_no like '%'||#{telNo}||'%' + + + and ui.user_nm like '%'||#{userNm}||'%' + + + and cm.ext_mail like '%'||#{extMail}||'%' + + + and cm.webex_no like '%'||#{webexNo}||'%' + + + and cm.katalk_id like '%'||#{katalkId}||'%' + + + diff --git a/src/main/resources/templates/equip/cellPhoneList.html b/src/main/resources/templates/equip/cellPhoneList.html index 38c01888..55d877ad 100644 --- a/src/main/resources/templates/equip/cellPhoneList.html +++ b/src/main/resources/templates/equip/cellPhoneList.html @@ -14,24 +14,6 @@
-
- - -
-
- -
-
-
- -
-
-
-
@@ -44,6 +26,57 @@
+
+ + +
+
+ +
+
+
+
+
+
+ +
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+ +
+
+
+
+ +
+
+
+
+
@@ -59,12 +92,12 @@ - + - + diff --git a/src/main/resources/templates/police/personnelStatus/personnelStatus.html b/src/main/resources/templates/police/personnelStatus/personnelStatus.html index 9781f2a5..e6a4a868 100644 --- a/src/main/resources/templates/police/personnelStatus/personnelStatus.html +++ b/src/main/resources/templates/police/personnelStatus/personnelStatus.html @@ -63,21 +63,21 @@ - + - + - + - + - + - + - + - + @@ -89,21 +89,21 @@ - + - + - + - + - + - + - + - +