修复改用户状态的bug和新增用户的问题

src/main/java/com/xzxtshiro/controller/admin/SysUserController.java

@@ -163,7 +163,7 @@ public class SysUserController {
             if(!"".equals(unit)&&unit!=null){
                 unitFlag=unit.substring(0,2);
             }
-            if ("66".equals(unitFlag)||"51".equals(unitFlag)){
+            if ("66".equals(unitFlag)||"51".equals(unitFlag)||"14".equals(unitFlag)){
                 //同步警综用户
                 tbJZuserxx(user);
             }
@@ -333,7 +333,7 @@ public class SysUserController {
     }
 
     /**
-     * 删除选择用户
+     * 删除选择用户  删除用户改为真实删除原因：内蒙用户新增用户重名和查询不到相互矛盾
      * @param user
      * @return
      */

src/main/java/com/xzxtshiro/dao/SysUserDao.java

@@ -45,4 +45,6 @@ public interface SysUserDao {
     SysUserZp selectUserZpByUserId(@Param("userId")String userId);
 
     Integer deleteUserZpByUserId(@Param("userId")String userId);
+
+    Integer deleteUserById(@Param("userId")String userId);
 }

src/main/java/com/xzxtshiro/mapper/SysUserMapper.xml

@@ -604,4 +604,8 @@
   <delete id="deleteUserZpByUserId">
     delete from SYS_USERZP where user_id =  #{userId,jdbcType=VARCHAR}
   </delete>
+  <!--根据用户id真实删除用户-->
+  <delete id="deleteUserById">
+    DELETE from sys_user where id = #{userId,jdbcType=VARCHAR}
+  </delete>
 </mapper>
\ No newline at end of file

src/main/java/com/xzxtshiro/service/imp/SysUserServiceImpl.java

@@ -302,14 +302,15 @@ public class SysUserServiceImpl implements SysUserService {
     }
 
 
+    /**
+     * 此处将用户删除修改，删除用户即为真实删除
+     * @param user
+     * @return
+     */
     @Override
     public Integer deleteUserById(SysUser user) {
         SysUser dlUser = TokenUtil.getUser();
-        //1.删除用户，此处即将scbz改为1
-        user.setGxsj(new Date());
-        user.setGxr(dlUser.getUsername());
-        user.setScbz(1);
-        int a = userDao.updateSysUserById(user);
+        int a = userDao.deleteUserById(user.getId());
         //2.删除用户和角色的绑定关系
         int b = userDao.deleteSysUserRoleByUserId(user.getId());
         if (a + b >= 2) {

src/main/resources/resource/db.properties

 jdbc.driverClassName=oracle.jdbc.driver.OracleDriver
 
 jdbc.driver=oracle.jdbc.driver.OracleDriver
-jdbc.url=jdbc:oracle:thin:@192.168.1.121:1521:XZXT3
+jdbc.url=jdbc:oracle:thin:@192.168.1.109:1521:XZXT3
 jdbc.username=XZXT
 jdbc.password=XZXT
 

src/main/webapp/WEB-INF/jsp/admin/user/list.jsp

@@ -176,6 +176,7 @@
             //此处需要完善
             if (obj.event === 'delete') {
                 var id = obj.data.id;
+                console.log(id);
                 layer.confirm('您确定要删除该用户吗？', {
                     btn: ['确定', '取消'] //按钮
                 }, function () {
@@ -185,9 +186,9 @@
                             //如果修改成功,则刷新页面
                             window.location.reload(); //刷新当前页面
                             layer.msg('删除成功!', {icon: 1});
+                        }else{
+                            layer.msg('删除失败!', {icon:5});
                         }
-                    }).error(function () {
-                        layer.msg('删除失败!', {icon:5});
                     });
                 });
             }
@@ -293,9 +294,7 @@
                 layero.find('.layui-layer-content').css({'padding':'3px 0 0 60px','width':'200px','margin-left':'-100px'});
             }});
             var elem = $(data.elem);
-            var trelem = elem.parents("tr");
-            var id=trelem.find(".laytable-cell-1-id").html();
-            //var data = obj.data;
+            var id = elem.parents("tr").find("td[data-field='id']").text();
             var val =this.checked ? '1' : '0';
             $.post("${pageContext.request.contextPath}/admin/user/updateState", {id: id, openFlag: val}, function (data) {
                 var data = data;