Merge branch 'dev_1_3_3_20220822'

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/TeacherMusicSheetVo.java

@@ -19,7 +19,7 @@ public class TeacherMusicSheetVo {
     private Long authMusicSheetId;
 
     @ApiModelProperty("0:新增，1：修改")
-    private Integer authType;
+    private Integer firstAuth;
 
     @ApiModelProperty("老师编号ID")
     private Long teacherId;
@@ -69,12 +69,12 @@ public class TeacherMusicSheetVo {
     @ApiModelProperty("审批人姓名")
     private String auditName;
 
-    public Integer getAuthType() {
-        return authType;
+    public Integer getFirstAuth() {
+        return firstAuth;
     }
 
-    public void setAuthType(Integer authType) {
-        this.authType = authType;
+    public void setFirstAuth(Integer firstAuth) {
+        this.firstAuth = firstAuth;
     }
 
     public Long getAuthMusicSheetId() {

cooleshow-user/user-biz/src/main/resources/config/mybatis/EmployeeMapper.xml

@@ -94,15 +94,18 @@
             <if test="null != param.gender">
                 and u.gender_ = #{param.gender}
             </if>
-            <if test="null != param.lockFlag">
-                and t.lock_flag_ = #{param.lockFlag}
-            </if>
             <if test="param.startTime !=null">
                 <![CDATA[AND t.create_time_ >= #{param.startTime} ]]>
             </if>
             <if test="param.endTime !=null">
                 <![CDATA[AND t.create_time_ < #{param.endTime} ]]>
             </if>
+            <if test="null != param.lockFlag">
+                and t.lock_flag_ = #{param.lockFlag}
+            </if>
+            <if test="null != param.delFlag">
+                and u.del_flag_ = #{param.delFlag}
+            </if>
         </where>
     </select>
 

cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicSheetMapper.xml

@@ -509,7 +509,7 @@
         ,ms.update_time_ as createTime
         ,if(msar.audit_state_ is null,ms.audit_status_,msar.audit_state_) as auditStatus
         ,su2.username_ as auditName
-        ,msar.first_auth_ as authType
+        ,msar.first_auth_ as firstAuth
         from music_sheet_auth_record  msar
         left join  music_sheet ms on ms.id_ = msar.music_sheet_id_
         left join sys_user su on su.id_ = ms.create_by_