合并代码

CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/impl/ToUserServerImpl.java

@@ -185,7 +185,7 @@ public class ToUserServerImpl implements IToUserService {
             return response;
         }
         ToUser userLoginName= toUserMapper.selectByLoginName(loginName);
-            if (null!=userLoginName && null != userLoginName.getLoginName()) {
+            if (null!=userLoginName) {
                 response.addError("您输入的手机号已存在");
                 return response;
             }
@@ -194,7 +194,10 @@ public class ToUserServerImpl implements IToUserService {
         JSONArray List = object.getJSONArray("menuArray");
         Integer[] roleIDArray = List.toArray(new Integer[]{});
         String remark = object.getString("remark");
-
+        if (null!=List){
+            response.addError("请选择角色");
+            return  response;
+        }
         toUser.setUserName(userName);
         toUser.setLoginName(loginName);
         toUser.setRemark(remark);
@@ -221,47 +224,54 @@ public class ToUserServerImpl implements IToUserService {
         ToUser toUser = new ToUser();
 
         String loginName = object.getString("loginName");
-        Integer ID= object.getInteger("id");
+        Integer ID = object.getInteger("id");
         String userName = object.getString("userName");
         JSONArray List = object.getJSONArray("menuArray");
         Integer[] roleIDArray = List.toArray(new Integer[]{});
         String remark = object.getString("remark");
 
-        if (!AccountValidatorUtil.isPhone(loginName)){
+        if (!AccountValidatorUtil.isPhone(loginName)) {
             response.addError("请输入正确的手机号!");
             return response;
         }
-        ToUser userLoginName= toUserMapper.selectByLoginName(loginName);
+        toUser.setUserName(userName);
+        toUser.setLoginName(loginName);
+        toUser.setRemark(remark);
+        toUser.setStatus("1");
+        toUser.setId(ID);
+        toUser.setUpdateUser(userID);
+        toUser.setUpdateDate(new Date());
+        //查询当前手机号是否重复,id是唯一区分修改的是不是一个人。
+        ToUser userLoginName = toUserMapper.selectByLoginName(loginName);
+        if (null!=userLoginName && !ID.equals(userLoginName.getId())){
+            response.addError("您输入的电话号码已存在");
+            return response;
+        }
         // 修改手机号排除自身
-        if (null!=userLoginName && null != userLoginName.getLoginName() &&(ID).equals(userLoginName.getId())) {
-            if (loginName.equals(userLoginName.getLoginName())){
-
-                toUser.setUserName(userName);
-                toUser.setLoginName(loginName);
-                toUser.setRemark(remark);
-                toUser.setStatus("1");
-                toUser.setId(ID);
-                toUser.setUpdateUser(userID);
-                toUser.setUpdateDate(new Date());
-                toUserMapper.updateByPrimaryKeySelective(toUser);
-
-                //会对应多个角色
-                if (null!=List) {
-                    toSysUserRoleMapper.deleteRole(ID);
-                    for (Integer roleID : roleIDArray) {
-                        ToSysUserRole toSysUserRole = new ToSysUserRole();
-                        toSysUserRole.setUserId(toUser.getId());
-                        toSysUserRole.setRoleId(roleID);
-                        toSysUserRoleMapper.insert(toSysUserRole);
-                    }
-                }
-            }
+        if (null != userLoginName && loginName.equals(userLoginName.getLoginName()) && ID.equals(userLoginName.getId())) {
+            toUserMapper.updateByPrimaryKeySelective(toUser);
+            multipleRole(ID,List,roleIDArray,toUser);
             response.addSuccess("成功");
             return response;
         }
+            toUserMapper.updateByPrimaryKeySelective(toUser);
+        multipleRole(ID,List,roleIDArray,toUser);
+            response.addSuccess("成功");
+            return response;
+    }
 
-        response.addError("您输入的手机号已存在");
-        return response;
+    //会对应多个角色
+    public void   multipleRole(Integer ID, JSONArray List, Integer[] roleIDArray, ToUser toUser) {
+        ToSysUserRole toSysUserRole = null;
+        if (null != List) {
+            toSysUserRoleMapper.deleteRole(ID);
+            for (Integer roleID : roleIDArray) {
+                toSysUserRole = new ToSysUserRole();
+                toSysUserRole.setUserId(toUser.getId());
+                toSysUserRole.setRoleId(roleID);
+                toSysUserRoleMapper.insert(toSysUserRole);
+            }
+        }
     }
 
     @Override

CODE/smart-community/operate-api/src/main/resources/mapper/ToUserMapper.xml

@@ -205,7 +205,7 @@
     LEFT JOIN to_sys_role sr ON to_sys_user_role.role_id = sr.id
     <where>
     <if test="loginName != null and loginName !=''" >
-      and tu.login_name = #{loginName,jdbcType=VARCHAR}
+      and tu.login_name like concat('%',#{loginName,jdbcType=VARCHAR},'%')
     </if>
     <if test="userName != null and userName !=''" >
       and tu.user_name like concat('%',#{userName,jdbcType=VARCHAR},'%')

CODE/smart-community/property-api/src/main/resources/mapper/UserMapper.xml

@@ -28,7 +28,7 @@
         LEFT JOIN tp_sys_role sr ON tp_sys_user_role.role_id = sr.id
         <where>
             <if test="loginName != null and loginName !=''" >
-                and tu.login_name = #{loginName,jdbcType=VARCHAR}
+                and tu.login_name like concat('%',#{loginName,jdbcType=VARCHAR},'%')
             </if>
             <if test="userName != null and userName !=''" >
                 and tu.user_name like concat('%',#{userName,jdbcType=VARCHAR},'%')

VUECODE/smart-operate-manage/src/views/account/user/addUser.vue

@@ -60,7 +60,9 @@ export default {
         loginName: [
           { required: true, message: '请输入手机号', trigger: 'blur' }
         ],
-        
+        menuArray: [
+          { required: true, message: '请选择角色', trigger: 'blur' }
+        ],        
       }
     }
   },

VUECODE/smart-operate-manage/src/views/account/user/edit.vue

@@ -59,7 +59,10 @@ export default {
         ],
         loginName: [
           { required: true, message: '请输入手机号', trigger: 'blur' }
-        ]
+        ],
+        menuArray: [
+          { required: true, message: '请选择角色', trigger: 'blur' }
+        ],
       }
     }
   },

VUECODE/smart-operate-manage/src/views/account/user/index.vue

@@ -28,7 +28,17 @@
         type="selection"
         width="55"/>
       <el-table-column prop="userName" label="姓名" align="center"/>
-      <el-table-column prop="roleName" label="角色" align="center"/>
+      <el-table-column prop="roleName" label="角色权限" align="center">
+        <template slot-scope="scope"><a :title="scope.row.roleName">
+          <span style="color: #8B8378	">
+            {{ scope.row.roleName.length>='15'?scope.row.roleName.substring(0,15)+'..':scope.row.roleName }}
+          </span>
+          <span v-if="scope.row.roleName==='null'">
+            {{ scope.row.roleName='' }}
+          </span>
+          </a>
+          </template>
+      </el-table-column>
       <el-table-column prop="loginName" label="手机号" align="center"/>
       <el-table-column prop="remark" label="备注" align="center"/>
       <el-table-column prop="createNmae" label="创建人" align="center"/>
@@ -72,7 +82,8 @@ export default {
         updateDate: '',
         status: '',
         pageNum: 1,
-        pageSize: 10
+        pageSize: 10,
+        roleNameNoNull:''
       },
       total: 0, // 数据总数
       listDate: [],

VUECODE/smart-property-manage/src/views/account/user/addUser.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="root">
     <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px" class="demo-ruleForm">
-      <el-form-item label="名称" prop="userName">
+      <el-form-item label="员工名称" prop="userName">
         <el-input v-model="ruleForm.userName"/>
       </el-form-item>
      <el-form-item class="filter-item" label="手机号" prop="loginName" >

VUECODE/smart-property-manage/src/views/account/user/editUser.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="root">
     <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px" class="demo-ruleForm">
-       <el-form-item label="活动名称" prop="userName">
+       <el-form-item label="员工名称" prop="userName">
           <el-input v-model="ruleForm.userName"/>
        </el-form-item>
     

VUECODE/smart-property-manage/src/views/account/user/index.vue

@@ -29,7 +29,16 @@
         width="55"/>
       <el-table-column prop="userName" label="姓名" align="center"/>
       <el-table-column prop="roleName" label="角色权限" align="center">
-        <template slot-scope="scope"><a :title="scope.row.roleName"><span style="color: #8B8378	">{{ scope.row.roleName.length>='15'?scope.row.roleName.substring(0,15)+'..':scope.row.roleName }}</span></a></template>
+      <template slot-scope="scope">
+        <a :title="scope.row.roleName">
+          <span style="color: #8B8378	">
+           {{ scope.row.roleName.length>='15'?scope.row.roleName.substring(0,15)+'..':scope.row.roleName }}
+          </span>
+          <span v-if="scope.row.roleName==='null'">
+           {{ scope.row.roleName='' }}
+          </span>
+        </a>
+      </template>
       </el-table-column>
       <el-table-column prop="loginName" label="手机号" align="center"/>
       <el-table-column prop="remark" label="备注" align="center"/>

文档/MYSQL/smartCommunity.pdm

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1548054656" Name="smartCommunity" Objects="731" Symbols="84" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
+<?PowerDesigner AppLocale="UTF16" ID="{1EFA7B8F-E5BE-422B-A0AE-B907AA87924F}" Label="" LastModificationDate="1548054656" Name="smartCommunity" Objects="720" Symbols="84" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
 <!-- do not edit this file -->
 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@@ -4122,8 +4122,8 @@ Shadow=0</a:DisplayPreferences>
 <o:ExtendedDependencySymbol Id="o5">
 <a:CreationDate>1539051658</a:CreationDate>
 <a:ModificationDate>1546565826</a:ModificationDate>
-<a:Rect>((-60148,32175), (-47935,37407))</a:Rect>
-<a:ListOfPoints>((-59748,37007),(-59748,32875),(-48335,32875))</a:ListOfPoints>
+<a:Rect>((-60148,32234), (-47449,37407))</a:Rect>
+<a:ListOfPoints>((-59748,37007),(-59748,32934),(-47849,32934))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>8</a:ArrowStyle>
 <a:LineColor>16744576</a:LineColor>
@@ -4143,8 +4143,8 @@ Shadow=0</a:DisplayPreferences>
 <o:ExtendedDependencySymbol Id="o9">
 <a:CreationDate>1539051667</a:CreationDate>
 <a:ModificationDate>1546565826</a:ModificationDate>
-<a:Rect>((-54344,27246), (-47852,32519))</a:Rect>
-<a:ListOfPoints>((-53944,27646),(-53944,31819),(-48252,31819))</a:ListOfPoints>
+<a:Rect>((-54910,27058), (-47374,32656))</a:Rect>
+<a:ListOfPoints>((-54510,27458),(-54510,31956),(-47774,31956))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>8</a:ArrowStyle>
 <a:LineColor>16744576</a:LineColor>
@@ -4164,8 +4164,8 @@ Shadow=0</a:DisplayPreferences>
 <o:ExtendedDependencySymbol Id="o12">
 <a:CreationDate>1539051707</a:CreationDate>
 <a:ModificationDate>1546565826</a:ModificationDate>
-<a:Rect>((-53743,40116), (-45981,47254))</a:Rect>
-<a:ListOfPoints>((-53343,40516),(-53343,46554),(-46381,46554))</a:ListOfPoints>
+<a:Rect>((-53743,40116), (-45482,47388))</a:Rect>
+<a:ListOfPoints>((-53343,40516),(-53343,46688),(-45882,46688))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>8</a:ArrowStyle>
 <a:LineColor>16744576</a:LineColor>
@@ -4185,8 +4185,8 @@ Shadow=0</a:DisplayPreferences>
 <o:ExtendedDependencySymbol Id="o15">
 <a:CreationDate>1539065038</a:CreationDate>
 <a:ModificationDate>1546565826</a:ModificationDate>
-<a:Rect>((-59805,47676), (-46351,51268))</a:Rect>
-<a:ListOfPoints>((-59405,50868),(-59405,48376),(-46751,48376))</a:ListOfPoints>
+<a:Rect>((-59805,47676), (-45818,51268))</a:Rect>
+<a:ListOfPoints>((-59405,50868),(-59405,48376),(-46218,48376))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>8</a:ArrowStyle>
 <a:LineColor>16744576</a:LineColor>
@@ -4225,8 +4225,8 @@ Shadow=0</a:DisplayPreferences>
 <o:ExtendedDependencySymbol Id="o22">
 <a:CreationDate>1539073104</a:CreationDate>
 <a:ModificationDate>1546565826</a:ModificationDate>
-<a:Rect>((41767,32575), (58103,40776))</a:Rect>
-<a:ListOfPoints>((42167,32975),(57403,32975),(57403,40376))</a:ListOfPoints>
+<a:Rect>((41119,32575), (58103,40776))</a:Rect>
+<a:ListOfPoints>((41519,32975),(57403,32975),(57403,40376))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>8</a:ArrowStyle>
 <a:LineColor>16744576</a:LineColor>
@@ -4285,8 +4285,8 @@ Shadow=0</a:DisplayPreferences>
 <o:ExtendedDependencySymbol Id="o31">
 <a:CreationDate>1539141182</a:CreationDate>
 <a:ModificationDate>1546565826</a:ModificationDate>
-<a:Rect>((8657,-15890), (54808,-5451))</a:Rect>
-<a:ListOfPoints>((54408,-15490),(29008,-15490),(29008,-6151),(9057,-6151))</a:ListOfPoints>
+<a:Rect>((9299,-15890), (54808,-5473))</a:Rect>
+<a:ListOfPoints>((54408,-15490),(29008,-15490),(29008,-6173),(9699,-6173))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>8</a:ArrowStyle>
 <a:LineColor>16744576</a:LineColor>
@@ -4306,8 +4306,8 @@ Shadow=0</a:DisplayPreferences>
 <o:ExtendedDependencySymbol Id="o35">
 <a:CreationDate>1539141343</a:CreationDate>
 <a:ModificationDate>1546565826</a:ModificationDate>
-<a:Rect>((-15551,-8618), (10229,506))</a:Rect>
-<a:ListOfPoints>((-15151,106),(-15151,-7918),(9829,-7918))</a:ListOfPoints>
+<a:Rect>((-15551,-8504), (10798,506))</a:Rect>
+<a:ListOfPoints>((-15151,106),(-15151,-7804),(10398,-7804))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>8</a:ArrowStyle>
 <a:LineColor>16744576</a:LineColor>
@@ -4327,8 +4327,8 @@ Shadow=0</a:DisplayPreferences>
 <o:ExtendedDependencySymbol Id="o38">
 <a:CreationDate>1539143631</a:CreationDate>
 <a:ModificationDate>1546565826</a:ModificationDate>
-<a:Rect>((22347,-39534), (36109,-5451))</a:Rect>
-<a:ListOfPoints>((35709,-39134),(30208,-39134),(30208,-6151),(22747,-6151))</a:ListOfPoints>
+<a:Rect>((21699,-39534), (36109,-5473))</a:Rect>
+<a:ListOfPoints>((35709,-39134),(30208,-39134),(30208,-6173),(22099,-6173))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>8</a:ArrowStyle>
 <a:LineColor>16744576</a:LineColor>
@@ -4348,8 +4348,8 @@ Shadow=0</a:DisplayPreferences>
 <o:ExtendedDependencySymbol Id="o41">
 <a:CreationDate>1539151702</a:CreationDate>
 <a:ModificationDate>1546565826</a:ModificationDate>
-<a:Rect>((15387,-38782), (36109,-18092))</a:Rect>
-<a:ListOfPoints>((35709,-38382),(35709,-29261),(29008,-29261),(29008,-18792),(15787,-18792))</a:ListOfPoints>
+<a:Rect>((15423,-38782), (36109,-18101))</a:Rect>
+<a:ListOfPoints>((35709,-38382),(35709,-29261),(29008,-29261),(29008,-18801),(15823,-18801))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>8</a:ArrowStyle>
 <a:LineColor>16744576</a:LineColor>
@@ -4369,8 +4369,8 @@ Shadow=0</a:DisplayPreferences>
 <o:ExtendedDependencySymbol Id="o44">
 <a:CreationDate>1539151705</a:CreationDate>
 <a:ModificationDate>1546565826</a:ModificationDate>
-<a:Rect>((-10004,-20243), (10109,3341))</a:Rect>
-<a:ListOfPoints>((-9604,2941),(1370,2941),(1370,-10932),(9409,-10932),(9409,-19843))</a:ListOfPoints>
+<a:Rect>((-10004,-20172), (10746,3341))</a:Rect>
+<a:ListOfPoints>((-9604,2941),(1370,2941),(1370,-10932),(10046,-10932),(10046,-19772))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>8</a:ArrowStyle>
 <a:LineColor>16744576</a:LineColor>
@@ -4492,8 +4492,8 @@ Shadow=0</a:DisplayPreferences>
 <o:ExtendedDependencySymbol Id="o60">
 <a:CreationDate>1539222729</a:CreationDate>
 <a:ModificationDate>1546565826</a:ModificationDate>
-<a:Rect>((-29660,4628), (-23962,6028))</a:Rect>
-<a:ListOfPoints>((-24362,5328),(-29260,5328))</a:ListOfPoints>
+<a:Rect>((-30193,4579), (-23962,5979))</a:Rect>
+<a:ListOfPoints>((-24362,5279),(-29793,5279))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>8</a:ArrowStyle>
 <a:LineColor>16744576</a:LineColor>
@@ -4512,8 +4512,8 @@ Shadow=0</a:DisplayPreferences>
 <o:ExtendedDependencySymbol Id="o63">
 <a:CreationDate>1539222732</a:CreationDate>
 <a:ModificationDate>1546565826</a:ModificationDate>
-<a:Rect>((-44949,2846), (-40456,4246))</a:Rect>
-<a:ListOfPoints>((-40856,3546),(-44549,3546))</a:ListOfPoints>
+<a:Rect>((-44949,2863), (-39923,4263))</a:Rect>
+<a:ListOfPoints>((-40323,3563),(-44549,3563))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>8</a:ArrowStyle>
 <a:LineColor>16744576</a:LineColor>
@@ -4774,8 +4774,8 @@ Shadow=0</a:DisplayPreferences>
 <o:ExtendedDependencySymbol Id="o99">
 <a:CreationDate>1541398705</a:CreationDate>
 <a:ModificationDate>1546565826</a:ModificationDate>
-<a:Rect>((-48149,-7351), (-40233,-5951))</a:Rect>
-<a:ListOfPoints>((-47749,-6651),(-40633,-6651))</a:ListOfPoints>
+<a:Rect>((-48821,-7359), (-39585,-5959))</a:Rect>
+<a:ListOfPoints>((-48421,-6659),(-39985,-6659))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>8</a:ArrowStyle>
 <a:LineColor>16744576</a:LineColor>
@@ -4794,8 +4794,8 @@ Shadow=0</a:DisplayPreferences>
 <o:ExtendedDependencySymbol Id="o103">
 <a:CreationDate>1546566350</a:CreationDate>
 <a:ModificationDate>1546566350</a:ModificationDate>
-<a:Rect>((22908,13047), (38292,14447))</a:Rect>
-<a:ListOfPoints>((23308,13747),(37892,13747))</a:ListOfPoints>
+<a:Rect>((22908,13047), (39033,14447))</a:Rect>
+<a:ListOfPoints>((23308,13747),(38633,13747))</a:ListOfPoints>
 <a:CornerStyle>1</a:CornerStyle>
 <a:ArrowStyle>8</a:ArrowStyle>
 <a:LineColor>16744576</a:LineColor>
@@ -4842,7 +4842,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:CreationDate>1539050106</a:CreationDate>
 <a:ModificationDate>1546565826</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-66265,20868), (-53803,29566))</a:Rect>
+<a:Rect>((-65686,21205), (-54382,29229))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -4867,7 +4867,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:CreationDate>1539050408</a:CreationDate>
 <a:ModificationDate>1546565826</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-48851,31127), (-37255,36225))</a:Rect>
+<a:Rect>((-48318,31314), (-37788,36038))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -4892,7 +4892,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:CreationDate>1539050486</a:CreationDate>
 <a:ModificationDate>1546565826</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-46751,45827), (-35155,50925))</a:Rect>
+<a:Rect>((-46218,46014), (-35688,50738))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -5048,7 +5048,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:CreationDate>1539072138</a:CreationDate>
 <a:ModificationDate>1546565826</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((28408,28176), (42167,37774))</a:Rect>
+<a:Rect>((29056,28551), (41519,37399))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -5285,7 +5285,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:CreationDate>1539140734</a:CreationDate>
 <a:ModificationDate>1546565826</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((8989,-10332), (22747,-2534))</a:Rect>
+<a:Rect>((9637,-10032), (22099,-2834))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -5364,7 +5364,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:CreationDate>1539143694</a:CreationDate>
 <a:ModificationDate>1546565826</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((9289,-22362), (23047,-15464))</a:Rect>
+<a:Rect>((9937,-22100), (22399,-15726))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -5578,7 +5578,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:CreationDate>1539222681</a:CreationDate>
 <a:ModificationDate>1546565826</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-40856,1458), (-29260,6556))</a:Rect>
+<a:Rect>((-40323,1645), (-29793,6369))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -5736,7 +5736,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:CreationDate>1539759734</a:CreationDate>
 <a:ModificationDate>1546565826</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-91560,43715), (-79532,50613))</a:Rect>
+<a:Rect>((-91005,43977), (-80087,50351))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -5786,7 +5786,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:CreationDate>1539764641</a:CreationDate>
 <a:ModificationDate>1546565826</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-8715,-53985), (4611,-47087))</a:Rect>
+<a:Rect>((-8090,-53723), (3986,-47349))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -5811,7 +5811,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:CreationDate>1540189341</a:CreationDate>
 <a:ModificationDate>1546565826</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-79191,-46121), (-64999,-41023))</a:Rect>
+<a:Rect>((-78519,-45934), (-65671,-41210))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -5917,7 +5917,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:CreationDate>1541397368</a:CreationDate>
 <a:ModificationDate>1546565826</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-40633,-11451), (-26874,-1853))</a:Rect>
+<a:Rect>((-39985,-11076), (-27522,-2228))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -5942,7 +5942,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:CreationDate>1541398568</a:CreationDate>
 <a:ModificationDate>1546565826</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-61941,-9102), (-47749,-4904))</a:Rect>
+<a:Rect>((-61269,-9002), (-48421,-5002))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -5967,7 +5967,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:CreationDate>1542706044</a:CreationDate>
 <a:ModificationDate>1546565826</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-40714,-66611), (-23926,-59713))</a:Rect>
+<a:Rect>((-39903,-66349), (-24737,-59975))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -5992,7 +5992,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:CreationDate>1542952019</a:CreationDate>
 <a:ModificationDate>1546565826</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-62763,-81761), (-47707,-55063))</a:Rect>
+<a:Rect>((-62045,-80674), (-48425,-56150))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -6069,7 +6069,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:CreationDate>1546565834</a:CreationDate>
 <a:ModificationDate>1546565834</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((37892,10748), (53382,16746))</a:Rect>
+<a:Rect>((38633,10973), (52641,16521))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -6094,7 +6094,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:CreationDate>1548054314</a:CreationDate>
 <a:ModificationDate>1548054314</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((-78562,-59175), (-63506,-54977))</a:Rect>
+<a:Rect>((-77844,-59075), (-64224,-55075))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>