部门数据为空修改

nngkxxdp/src/main/resources/mapper/UserDao.xml

@@ -161,17 +161,28 @@
         select count(1) from t_user where username =#{username} and password =#{pd}
     </select>
     
+<!--    <select id="getAllPhoneByUser" resultType="java.util.Map">-->
+<!--    	SELECT -->
+<!--			td.deptname,-->
+<!--			tu.leaderperson,-->
+<!--			tu.leaderphone,-->
+<!--			tu.workperson,-->
+<!--			tu.workphone-->
+<!--		FROM t_user tu-->
+<!--		LEFT JOIN t_dept td ON tu.deptid = td.deptid-->
+<!--		WHERE tu.workphone IS NOT NULL-->
+<!--		GROUP BY tu.deptid-->
+<!--    </select>-->
+
     <select id="getAllPhoneByUser" resultType="java.util.Map">
-    	SELECT 
-			td.deptname,
-			tu.leaderperson,
-			tu.leaderphone,
-			tu.workperson,
-			tu.workphone
-		FROM t_user tu
-		LEFT JOIN t_dept td ON tu.deptid = td.deptid
-		WHERE tu.workphone IS NOT NULL
-		GROUP BY tu.deptid
+        SELECT
+            deptname,
+            leaderperson,
+            leaderphone,
+            workperson,
+            workphone
+        FROM
+            t_dept
     </select>
 
 </mapper>

nngkxxdp/src/main/resources/mapper/WebsiteSmsDao.xml

@@ -40,14 +40,14 @@
     </insert>
 
     <update id="updateWebsiteSms">
-        UPDATE t_user
+        UPDATE t_dept
         SET
          workperson = #{workperson}
             , workphone = #{workphone}
             , leaderperson = #{leaderperson}
             , leaderphone = #{leaderphone}
         WHERE
-            id = #{id}
+            deptid = #{id}
     </update>
 
 
@@ -55,22 +55,33 @@
         SELECT COUNT(*) FROM t_user
     </select>
 
+<!--    <select id="getShortMessage" resultType="java.util.Map">-->
+<!--        SELECT-->
+<!--            td.deptid,-->
+<!--            td.deptname,-->
+<!--            tu.id,-->
+<!--            tu.nickname,-->
+<!--            tu.leaderperson,-->
+<!--            tu.leaderphone,-->
+<!--            tu.workphone,-->
+<!--            tu.workperson-->
+<!--        FROM-->
+<!--            t_dept td-->
+<!--                LEFT JOIN t_user tu ON td.deptid = tu.deptid-->
+<!--        WHERE-->
+<!--            n_dept != ''-->
+<!--	and tu.nickname LIKE '%区%' or tu.nickname LIKE '%镇%' or tu.nickname LIKE '%街%'-->
+<!--        group by tu.nickname-->
+<!--    </select>-->
     <select id="getShortMessage" resultType="java.util.Map">
         SELECT
-            td.deptid,
-            td.deptname,
-            tu.id,
-            tu.n_dept,
-            tu.leaderperson,
-            tu.leaderphone,
-            tu.workphone,
-            tu.workperson
+            deptid,
+            deptname,
+            leaderperson,
+            leaderphone,
+            workperson,
+            workphone
         FROM
-            t_dept td
-                LEFT JOIN t_user tu ON td.deptid = tu.deptid
-        WHERE
-            n_dept != ''
-        group by n_dept
-            LIMIT 999999999
+            t_dept
     </select>
 </mapper>

nngkxxdp/src/main/resources/static/page/js/base/fbtx.item.js

@@ -625,7 +625,7 @@ function initSmsTable() {
 		skin: 'line',
 		cols: [[
 			{width:80, title: '序号', type: 'numbers'},
-			{field:'deptname', title: '部门名称'},
+			{field:'sendName', title: '部门名称'},
 			{title: '提醒人员', templet: function(d) {
 					return d.sendName;
 				}},
@@ -649,7 +649,7 @@ function initSmsTable() {
 		skin: 'line',
 		cols: [[
 			{width:80, title: '序号', type: 'numbers'},
-			{field:'nDept', title: '部门名称'},
+			{field:'deptname', title: '部门名称'},
 			{title: '分管领导', templet: function(d) {
 					return (d.leaderperson && d.leaderphone)? d.leaderperson+" "+ d.leaderphone : '暂无';
 				}},
@@ -657,7 +657,7 @@ function initSmsTable() {
 					return  (d.workperson && d.workphone) ? d.workperson+" "+ d.workphone: '暂无'
 				}},
 			{title: '操作', templet: function(d) {
-					return '<p style="color:#1276ff;cursor: pointer;" onclick="xg(\''+ d.leaderperson +'\',\''+ d.leaderphone +'\',\''+ d.workperson +'\',\''+ d.workphone +'\',\''+ d.id +'\')">修改</p>';
+					return '<p style="color:#1276ff;cursor: pointer;" onclick="xg(\''+ d.leaderperson +'\',\''+ d.leaderphone +'\',\''+ d.workperson +'\',\''+ d.workphone +'\',\''+ d.deptid +'\')">修改</p>';
 				}}
 		]]
 	});
@@ -724,47 +724,47 @@ function reloadSmsTable() {
 	    ]]
 	});
 
-	//网站短信记录
-	table.reload('w-sms-website-table', {
-		url: '/websitesms/getWebsiteSms',
-		page: false,
-		cols: [[
-			{width:80, title: '序号', type: 'numbers'},
-			{field:'deptname', title: '部门名称'},
-			{title: '提醒人员', templet: function(d) {
-					return d.sendName;
-				}},
-			{title: '提醒号码', templet: function(d) {
-					return d.leadPhone;
-				}},
-			{title: '提醒记录', templet: function(d) {
-					return d.createTime;
-				}},
-			{title: '操作', templet: function(d) {
-					return '<a style="color:#1276ff;cursor: pointer;" onclick="details(\''+ d.id +'\')">详情</a>';
-				}}
-		]]
-	});
-
-	//修改人员信息
-	table.render({
-		elem: '#w-dx-wechat-table',
-		url: '/websitesms/getShortMessage',
-		skin: 'line',
-		cols: [[
-			{width:80, title: '序号', type: 'numbers'},
-			{field:'nDept', title: '部门名称'},
-			{title: '分管领导', templet: function(d) {
-					return (d.leaderperson && d.leaderphone)? d.leaderperson+" "+ d.leaderphone : '暂无';
-				}},
-			{title: '工作人员', templet: function(d) {
-				return  (d.workperson && d.workphone) ? d.workperson+" "+ d.workphone: '暂无'
-				}},
-			{title: '操作', templet: function(d) {
-					return '<p style="color:#1276ff;cursor: pointer;" onclick="xg(\''+ d.leaderperson +'\',\''+ d.leaderphone +'\',\''+ d.workperson +'\',\''+ d.workphone +'\',\''+ d.id +'\')">修改</p>';
-				}}
-		]]
-	});
+	// //网站短信记录
+	// table.reload('w-sms-website-table', {
+	// 	url: '/websitesms/getWebsiteSms',
+	// 	page: false,
+	// 	cols: [[
+	// 		{width:80, title: '序号', type: 'numbers'},
+	// 		{field:'deptname', title: '部门名称'},
+	// 		{title: '提醒人员', templet: function(d) {
+	// 				return d.sendName;
+	// 			}},
+	// 		{title: '提醒号码', templet: function(d) {
+	// 				return d.leadPhone;
+	// 			}},
+	// 		{title: '提醒记录', templet: function(d) {
+	// 				return d.createTime;
+	// 			}},
+	// 		{title: '操作', templet: function(d) {
+	// 				return '<a style="color:#1276ff;cursor: pointer;" onclick="details(\''+ d.id +'\')">详情</a>';
+	// 			}}
+	// 	]]
+	// });
+
+	// //修改人员信息
+	// table.render({
+	// 	elem: '#w-dx-wechat-table',
+	// 	url: '/websitesms/getShortMessage',
+	// 	skin: 'line',
+	// 	cols: [[
+	// 		{width:80, title: '序号', type: 'numbers'},
+	// 		{field:'deptname', title: '部门名称'},
+	// 		{title: '分管领导', templet: function(d) {
+	// 				return (d.leaderperson && d.leaderphone)? d.leaderperson+" "+ d.leaderphone : '暂无';
+	// 			}},
+	// 		{title: '工作人员', templet: function(d) {
+	// 			return  (d.workperson && d.workphone) ? d.workperson+" "+ d.workphone: '暂无'
+	// 			}},
+	// 		{title: '操作', templet: function(d) {
+	// 				return '<p style="color:#1276ff;cursor: pointer;" onclick="xg(\''+ d.leaderperson +'\',\''+ d.leaderphone +'\',\''+ d.workperson +'\',\''+ d.workphone +'\',\''+ d.id +'\')">修改</p>';
+	// 			}}
+	// 	]]
+	// });
 }
 
 function  details(id){
@@ -787,7 +787,7 @@ function  details(id){
 }
 
 
-function xg (leaderperson,leaderphone,workperson,workphone,id){
+function xg (leaderperson,leaderphone,workperson,workphone,deptid){
 	//为空或者为undefined 清空内容
 	leaderperson = leaderperson != "undefined" ? leaderperson : '';
 	leaderphone = leaderphone != "undefined" ? leaderphone : '';
@@ -814,7 +814,7 @@ function xg (leaderperson,leaderphone,workperson,workphone,id){
 				url: PATH + '/websitesms/updateWebsiteSms',
 				type: 'get',
 				data: {
-					"id":id,
+					"id":deptid,
 					"leaderperson":leaderperson,
 					"leaderphone":leaderphone,
 					"workperson":workperson,