Merge remote-tracking branch 'origin/master'

pom.xml

@@ -179,7 +179,11 @@
             <artifactId>guava</artifactId>
             <version>20.0</version>
         </dependency>
-
+        <!-- 引入aop-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

user_center/src/main/java/com/huaxu/dao/TenantMapper.java

@@ -100,7 +100,7 @@ public interface TenantMapper  {
      * 创建租户菜单
      * @return
      */
-    int createTenantMenu( @Param("userName") String userName,@Param("tenantId") Integer tenantId, @Param("menuIds") List<Integer> menuIds);
+    int createTenantMenu( @Param("userName") String userName,@Param("tenantId") String tenantId, @Param("menuIds") List<Integer> menuIds);
 
     /**
      * 通过租户id查询租户菜单id

user_center/src/main/java/com/huaxu/entity/OperateLogEntity.java

@@ -35,8 +35,10 @@ public class OperateLogEntity implements Serializable {
     @ApiModelProperty(value = "部门id")
     private Integer departmentId;
     @ExcelProperty(value = {"操作日志","操作内容"},index = 4)
-    @ApiModelProperty(value = "操作内容",example = "2020-12-12 12:12:12")
+    @ApiModelProperty(value = "操作内容")
     private String operateContent;
+    @ApiModelProperty(value = "操作参数",hidden = true)
+    private String operateParameter;
     @ExcelProperty(value = {"操作日志","创建时间"},index = 5)
     @ApiModelProperty(value = "创建时间",example = "2020-12-12 12:12:12")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")

user_center/src/main/java/com/huaxu/service/impl/TenantServiceImpl.java

@@ -123,7 +123,7 @@ public class TenantServiceImpl implements TenantService {
 
         //创建租户菜单信息
         if(tenantDto.getTenantMenuIds().size()>0){
-            tenantMapper.createTenantMenu(tenantDto.getCreateBy(),tenantDto.getId(),tenantDto.getTenantMenuIds());
+            tenantMapper.createTenantMenu(tenantDto.getCreateBy(),tenantDto.getCode(),tenantDto.getTenantMenuIds());
         }
         //创建角色
         Role role = new Role();
@@ -232,7 +232,7 @@ public class TenantServiceImpl implements TenantService {
         List<Integer> addTenantMenuIds = newTenantMenuIds.stream().filter(item -> !oldTenantMenuIds.contains(item)).collect(Collectors.toList());
         //创建租户菜单信息
         if(addTenantMenuIds.size()>0){
-            tenantMapper.createTenantMenu(tenantDto.getUpdateBy(),tenantDto.getId(),addTenantMenuIds);
+            tenantMapper.createTenantMenu(tenantDto.getUpdateBy(),tenantDto.getCode(),addTenantMenuIds);
         }
         //去掉的菜单id(需要删除的)
         List<Integer> deleteTenantMenuIds = oldTenantMenuIds.stream().filter(item -> !newTenantMenuIds.contains(item)).collect(Collectors.toList());

user_center/src/main/resources/mapper/OperateLogMapper.xml

@@ -92,16 +92,16 @@
     </select>
     <!-- 新增所有列 -->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
-        insert into uims_opr_log( USER_NAME, phone, company_id, DEPARTMENT_ID, operate_content, create_time )
-        values ( #{userName}, #{phone}, #{companyId}, #{departmentId}, #{operateContent}, #{createTime})
+        insert into uims_opr_log( USER_NAME, phone, company_id, DEPARTMENT_ID, operate_content, create_time, operate_parameter)
+        values ( #{userName}, #{phone}, #{companyId}, #{departmentId}, #{operateContent}, #{createTime}, #{operateParameter})
     </insert>
     <!-- 批量新增 -->
     <insert id="batchInsert">
-        insert into uims_opr_log( USER_NAME, phone, company_id, DEPARTMENT_ID, operate_content, create_time )
+        insert into uims_opr_log( USER_NAME, phone, company_id, DEPARTMENT_ID, operate_content, create_time, operate_parameter )
         values
         <foreach collection="loginLogs" item="item" index="index" separator=",">
             ( #{item.userName}, #{item.phone}, #{item.companyId}, #{item.departmentId}, #{item.operateContent},
-            #{item.createTime})
+            #{item.createTime}, #{item.operateParameter})
         </foreach>
     </insert>
     <!-- 通过主键修改数据 -->
@@ -126,6 +126,9 @@
             <if test="createTime != null">
                 create_time = #{createTime},
             </if>
+            <if test="operateParameter != null and operateParameter != ''">
+                operate_parameter = #{operateParameter},
+            </if>
         </set>
         where id = #{id}
     </update>