人口管理

huanghongfa

2021-01-19 1a65f5d53d2212c893a1d3858846a5af2f0df5a2

人口管理

 springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml

@@ -24,7 +24,7 @@
  <component name="ChangeListManager">
    <list default="true" id="8ba27629-3e5d-4f42-993e-d0c055bc9371" name="Default Changelist" comment="">
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -404,7 +404,7 @@
      <workItem from="1610934956567" duration="1325000" />
      <workItem from="1610939265133" duration="8588000" />
      <workItem from="1610956684718" duration="7037000" />
      <workItem from="1611019208339" duration="10917000" />
      <workItem from="1611019208339" duration="14141000" />
    </task>
    <servers />
  </component>
@@ -456,54 +456,54 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1610606590056" />
    <state width="1031" height="416" key="GridCell.Tab.0.bottom" timestamp="1611031008988">
    <state width="1031" height="416" key="GridCell.Tab.0.bottom" timestamp="1611039695338">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="416" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611031008988" />
    <state width="1031" height="416" key="GridCell.Tab.0.center" timestamp="1611031008988">
    <state width="1031" height="416" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611039695338" />
    <state width="1031" height="416" key="GridCell.Tab.0.center" timestamp="1611039695338">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="416" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611031008988" />
    <state width="1031" height="416" key="GridCell.Tab.0.left" timestamp="1611031008988">
    <state width="1031" height="416" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1611039695338" />
    <state width="1031" height="416" key="GridCell.Tab.0.left" timestamp="1611039695338">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="416" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611031008988" />
    <state width="1031" height="416" key="GridCell.Tab.0.right" timestamp="1611031008988">
    <state width="1031" height="416" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1611039695338" />
    <state width="1031" height="416" key="GridCell.Tab.0.right" timestamp="1611039695338">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="416" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611031008988" />
    <state width="1031" height="416" key="GridCell.Tab.1.bottom" timestamp="1611031008988">
    <state width="1031" height="416" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1611039695338" />
    <state width="1031" height="416" key="GridCell.Tab.1.bottom" timestamp="1611039695339">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="416" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611031008988" />
    <state width="1031" height="416" key="GridCell.Tab.1.center" timestamp="1611031008988">
    <state width="1031" height="416" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611039695339" />
    <state width="1031" height="416" key="GridCell.Tab.1.center" timestamp="1611039695338">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="416" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1611031008988" />
    <state width="1031" height="416" key="GridCell.Tab.1.left" timestamp="1611031008988">
    <state width="1031" height="416" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1611039695338" />
    <state width="1031" height="416" key="GridCell.Tab.1.left" timestamp="1611039695338">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="416" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1611031008988" />
    <state width="1031" height="416" key="GridCell.Tab.1.right" timestamp="1611031008988">
    <state width="1031" height="416" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1611039695338" />
    <state width="1031" height="416" key="GridCell.Tab.1.right" timestamp="1611039695338">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="416" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1611031008988" />
    <state width="1031" height="416" key="GridCell.Tab.2.bottom" timestamp="1611031008988">
    <state width="1031" height="416" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1611039695338" />
    <state width="1031" height="416" key="GridCell.Tab.2.bottom" timestamp="1611039695339">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="416" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611031008988" />
    <state width="1031" height="416" key="GridCell.Tab.2.center" timestamp="1611031008988">
    <state width="1031" height="416" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1611039695339" />
    <state width="1031" height="416" key="GridCell.Tab.2.center" timestamp="1611039695339">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="416" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1611031008988" />
    <state width="1031" height="416" key="GridCell.Tab.2.left" timestamp="1611031008988">
    <state width="1031" height="416" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1611039695339" />
    <state width="1031" height="416" key="GridCell.Tab.2.left" timestamp="1611039695339">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="416" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1611031008988" />
    <state width="1031" height="416" key="GridCell.Tab.2.right" timestamp="1611031008988">
    <state width="1031" height="416" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1611039695339" />
    <state width="1031" height="416" key="GridCell.Tab.2.right" timestamp="1611039695339">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="416" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1611031008988" />
    <state width="1031" height="416" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1611039695339" />
    <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1610611848124">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
@@ -524,10 +524,10 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="93" y="93" width="1350" height="639" key="com.intellij.history.integration.ui.views.FileHistoryDialog/0.0.1536.824@0.0.1536.824" timestamp="1611023689827" />
    <state x="468" y="42" width="766" height="782" key="find.popup" timestamp="1611031083011">
    <state x="468" y="42" width="766" height="782" key="find.popup" timestamp="1611032355772">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="468" y="42" width="766" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1611031083011" />
    <state x="468" y="42" width="766" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1611032355772" />
    <state width="600" height="428" key="javadoc.popup" timestamp="1610005781618">
      <screen x="0" y="0" width="1536" height="824" />
    </state>

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java

@@ -50,20 +50,20 @@
            "u.phone,\n" +
            "u.id_card,\n" +
            "u.face_state,\n" +
            "c.name,\n" +
            "c.area_name communityName,\n" +
            "u.create_at \n" +
            "FROM\n" +
            "sys_user u\n" +
            "JOIN com_act c ON u.community_id = c.community_id \n" +
            "<if test='loginUserInfoVO.name != null and loginUserInfoVO.name.trim() != &quot;&quot;'>" +
            "AND c.`name` = #{loginUserInfoVO.name} \n" +
            "JOIN com_mng_struct_area c ON u.area_id = c.id \n" +
            "<if test='loginUserInfoVO.communityName != null and loginUserInfoVO.communityName.trim() != &quot;&quot;'>" +
            "AND c.`area_name` like concat(#{loginUserInfoVO.communityName},'%')  \n" +
            " </if> " +
            " where u.face_state is not null and u.type=1" +
            "<if test='loginUserInfoVO.communityName != null and loginUserInfoVO.communityName.trim() != &quot;&quot;'>" +
            "and u.`name` = #{loginUserInfoVO.communityName} \n" +
            "<if test='loginUserInfoVO.name != null and loginUserInfoVO.name.trim() != &quot;&quot;'>" +
            "and u.`name` like concat(#{loginUserInfoVO.name},'%')  \n" +
            " </if> " +
            "<if test='loginUserInfoVO.phone != null and loginUserInfoVO.phone.trim() != &quot;&quot;'>" +
            "AND u.phone = #{loginUserInfoVO.phone}" +
            "AND u.phone like concat(#{loginUserInfoVO.phone},'%') " +
            " </if> " +
            " order by u.face_state asc,u.create_at asc " +
            "</script>")
@@ -77,21 +77,26 @@
            "u.phone,\n" +
            "u.id_card,\n" +
            "u.job,\n" +
            "c.name,\n" +
            "c.area_name communityName,\n" +
            "u.tags,\n" +
            "u.create_at \n" +
            "FROM\n" +
            "sys_user u\n" +
            "LEFT JOIN com_act c ON u.community_id = c.community_id \n" +
            "<if test='loginUserInfoVO.name != null and loginUserInfoVO.name.trim() != &quot;&quot;'>" +
            " JOIN com_mng_struct_area c ON u.area_id = c.id \n" +
            " </if> " +
            "<if test='loginUserInfoVO.name == null or loginUserInfoVO.name.trim() == &quot;&quot;'>" +
            "LEFT JOIN com_mng_struct_area c ON u.area_id = c.id \n" +
            " </if> " +
            "<if test='loginUserInfoVO.communityName != null and loginUserInfoVO.communityName.trim() != &quot;&quot;'>" +
            "AND c.`name` = #{loginUserInfoVO.communityName} \n" +
            "AND c.`area_name` like concat(#{loginUserInfoVO.communityName},'%')  \n" +
            " </if> " +
            " <where>" +
            "<if test='loginUserInfoVO.name != null and loginUserInfoVO.name.trim() != &quot;&quot;'>" +
            " and u.`name` = #{loginUserInfoVO.name} \n" +
            " and u.`name` like concat(#{loginUserInfoVO.name},'%')  \n" +
            " </if> " +
            "<if test='loginUserInfoVO.phone != null and loginUserInfoVO.phone.trim() != &quot;&quot;'>" +
            "AND u.phone = #{loginUserInfoVO.phone}" +
            "AND u.phone like concat(#{loginUserInfoVO.phone},'%') " +
            " </if> " +
            " </where>" +
            "</script>")